OSDN Git Service

am 64902de0: (-s ours) am e568ae9d: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Fri, 15 May 2015 17:09:03 +0000 (17:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 May 2015 17:09:03 +0000 (17:09 +0000)
* commit '64902de02230c626b8e2b919f920e4908c79828a':


Trivial merge