OSDN Git Service

am 886ac25c: (-s ours) am 449dc733: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Fri, 7 Nov 2014 15:11:28 +0000 (15:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Nov 2014 15:11:28 +0000 (15:11 +0000)
commit040cb642e30e77879f4713ce75db169dca16e58a
treeaac2e98319d5928128164a49caf3380e74a9fe61
parentccd9fb5bde55eb0ee62c740bb4f8dd458c2197e5
parent886ac25c6965998f46c6027eb42122a62523b151
am 886ac25c: (-s ours) am 449dc733: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '886ac25c6965998f46c6027eb42122a62523b151':
  Import translations. DO NOT MERGE