OSDN Git Service

am c140584b: (-s ours) am 79ace565: (-s ours) am 3723625f: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Fri, 22 Aug 2014 17:55:48 +0000 (17:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Aug 2014 17:55:48 +0000 (17:55 +0000)
commitc2ef0ada7ab02dd058f5b98d98598acc0751e7e5
tree835cee6f8e9600e448e8fc47fcb8619a5b69b9a2
parent3f2be99c1d7a708f6a16f680afc85a87258c639d
parentc140584bef8beda0902cc4e600ab2d1eafbe9e3b
am c140584b: (-s ours) am 79ace565: (-s ours) am 3723625f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'c140584bef8beda0902cc4e600ab2d1eafbe9e3b':
  Import translations. DO NOT MERGE