OSDN Git Service

am f427688c: (-s ours) am e2a0d44c: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 22:45:24 +0000 (22:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 22:45:24 +0000 (22:45 +0000)
commit97eabdbdc943ec361de9cb948676a75adc2723e8
treea4a82ef6ad1d4f9642c396b346b156449805dfcf
parentdeb9aa8cfd89c04d130758f9a82e45f77bba0431
parentf427688c37561a525927db8003c1fcb3f9cbed94
am f427688c: (-s ours) am e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'f427688c37561a525927db8003c1fcb3f9cbed94':
  Import translations. DO NOT MERGE