OSDN Git Service

am 878b49dc: (-s ours) am 31a23f3b: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 8 Dec 2014 18:04:07 +0000 (18:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Dec 2014 18:04:07 +0000 (18:04 +0000)
* commit '878b49dc707961d8797ab750e78d3fb2bb048152':
  Import translations. DO NOT MERGE


Trivial merge