OSDN Git Service

am 617918d6: (-s ours) Import translations. DO NOT MERGE automerge: ad3b94f -s ours
authorBaligh Uddin <baligh@google.com>
Tue, 30 Dec 2014 12:14:28 +0000 (12:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Dec 2014 12:14:28 +0000 (12:14 +0000)
commit0223c588de5cc73e5dcf8cd5d81da24990cff3b0
tree3b878d445d13efa6341b143ad609212c33e4d0d9
parent002b571f74a66e5c3ca7ccb4c0c378ae35cecae0
parent617918d61b3023d2f6910b4097ea1b772612372c
am 617918d6: (-s ours) Import translations. DO NOT MERGE automerge: ad3b94f  -s ours

* commit '617918d61b3023d2f6910b4097ea1b772612372c':
  Import translations. DO NOT MERGE