OSDN Git Service

am 2e51738d: (-s ours) am 36c103d6: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 22:45:29 +0000 (22:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 22:45:29 +0000 (22:45 +0000)
commit15aa75e3f86f6a10512925f117240d7d2d8b291b
treea4a82ef6ad1d4f9642c396b346b156449805dfcf
parent97eabdbdc943ec361de9cb948676a75adc2723e8
parent2e51738d7c93e547dbd484014e11d770270030e0
am 2e51738d: (-s ours) am 36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '2e51738d7c93e547dbd484014e11d770270030e0':
  Import translations. DO NOT MERGE