OSDN Git Service

am e5c66661: (-s ours) am 5559d54b: (-s ours) am ede11beb: (-s ours) am 34663b0f...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 14:47:32 +0000 (14:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 14:47:32 +0000 (14:47 +0000)
* commit 'e5c66661bee732b65454a9dfac233585bd5975e9':
  Import translations. DO NOT MERGE


Trivial merge