OSDN Git Service

am 3bc4f51f: (-s ours) am 69ea07be: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 14 May 2015 09:50:22 +0000 (09:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 May 2015 09:50:22 +0000 (09:50 +0000)
commit2611909abcf6d333062aa1e51e3b6a65c815d35f
tree1b532c550068e98d020018b79265533edc174aa7
parentaf1985b3170f9c49353457f60d708a1826e37635
parent3bc4f51f4360f2e8be659935ab8ba7ee49ddd60e
am 3bc4f51f: (-s ours) am 69ea07be: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '3bc4f51f4360f2e8be659935ab8ba7ee49ddd60e':
  Import translations. DO NOT MERGE