OSDN Git Service

am 9e974a89: (-s ours) am a67f961f: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Wed, 26 Aug 2015 16:46:09 +0000 (16:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Aug 2015 16:46:09 +0000 (16:46 +0000)
commit5897f6ad060b9a6154ac220d3b4cb2fbbe4c1682
tree63310f1d7485d070b4e937aee80d5201eba29711
parent4e06032f0d14f47d1ba5ad5c999aa7c61e26b878
parent9e974a89366a935031a3cab98a1a71addfd30024
am 9e974a89: (-s ours) am a67f961f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '9e974a89366a935031a3cab98a1a71addfd30024':
  Import translations. DO NOT MERGE