OSDN Git Service

am 5e73ac02: (-s ours) am 305cf0f8: (-s ours) am 4d64bdbc: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 15:43:16 +0000 (15:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 15:43:16 +0000 (15:43 +0000)
* commit '5e73ac027d795c0442c841e6081fc6f43c8d7390':
  Import translations. DO NOT MERGE


Trivial merge