OSDN Git Service

am 09495631: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
authorGeoff Mendal <mendal@google.com>
Sun, 31 May 2015 03:03:06 +0000 (03:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 31 May 2015 03:03:06 +0000 (03:03 +0000)
* commit '094956316ebb26b12198102c157fdb980bf646e3':
  Import translations. DO NOT MERGE


Trivial merge