OSDN Git Service

am f1eeedb7: (-s ours) am 4bd2b9b5: (-s ours) am f5cafa5a: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Tue, 16 Sep 2014 15:21:32 +0000 (15:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 15:21:32 +0000 (15:21 +0000)
* commit 'f1eeedb796786fc060cc38f10809d0593a6ca40a':
  Import translations. DO NOT MERGE


Trivial merge