OSDN Git Service

am c742cfc7: (-s ours) am 6f96fcc5: (-s ours) am 321b25a1: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Tue, 16 Sep 2014 15:21:01 +0000 (15:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 15:21:01 +0000 (15:21 +0000)
commitabc05267d2a7abc49092d06195e507aa3d6207b5
tree676a23881b3968eb73e9d64f7d62cfd0400950ab
parent4e7ebb332654a24254e9f7d59c05e4de33ccfa3d
parentc742cfc716bba4ee2bd6dbe62a42d182baa4b6bd
am c742cfc7: (-s ours) am 6f96fcc5: (-s ours) am 321b25a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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