OSDN Git Service

am aec2c787: (-s ours) am fab538f9: (-s ours) am 12d1d989: (-s ours) am 213e0c1d...
authorGeoff Mendal <mendal@google.com>
Sat, 25 Jul 2015 16:48:22 +0000 (16:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 25 Jul 2015 16:48:22 +0000 (16:48 +0000)
* commit 'aec2c787a5234327377cb8f07cbee9407f13b52e':
  Import translations. DO NOT MERGE


Trivial merge