OSDN Git Service

am 6a007e1b: (-s ours) am 8e4a24db: (-s ours) am 3fa50c35: (-s ours) am a06a903f...
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 18:46:05 +0000 (18:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 18:46:05 +0000 (18:46 +0000)
* commit '6a007e1b45ebe1895ed1a0ad01476b35408557d6':
  Import translations. DO NOT MERGE


Trivial merge