OSDN Git Service

am 5b3e66d0: (-s ours) am 9846e4c6: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Tue, 1 Jul 2014 18:20:31 +0000 (18:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Jul 2014 18:20:31 +0000 (18:20 +0000)
* commit '5b3e66d0f65f08de89980700f0b4f0764ae85bce':
  Import translations. DO NOT MERGE


Trivial merge