OSDN Git Service

am f999d572: (-s ours) am c123f953: (-s ours) am 4accfd0b: (-s ours) am 1bd19dd1...
authorGeoff Mendal <mendal@google.com>
Mon, 12 Oct 2015 13:22:50 +0000 (13:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2015 13:22:50 +0000 (13:22 +0000)
* commit 'f999d57278db3c12ce0911d83781978f657f8ede':
  Import translations. DO NOT MERGE


Trivial merge