summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-05-14 00:07:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-14 00:07:25 +0000
commit6b8c18af3e31d46f0a0d8a53d6444e058285cb8d (patch)
treec2175942e3a631ad112fe6ab17da560c45fc1ae2
parentcd6362f83e02aa0494e97e39213d18fbf73f6171 (diff)
parent87bb17226ef9cbdc0a49628b57ca48152d8513ca (diff)
am 87bb1722: (-s ours) am 87cf81d2: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '87bb17226ef9cbdc0a49628b57ca48152d8513ca':
0 files changed, 0 insertions, 0 deletions