OSDN Git Service

am 257a9a87: (-s ours) am 81d99d47: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Wed, 19 Aug 2015 14:20:53 +0000 (14:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Aug 2015 14:20:53 +0000 (14:20 +0000)
commit5b9e3290062e4065aeb45085ea908b81c1fbe909
treeff902917e64d15483d08ce332d98b8bf3d2dcc33
parent2c6fe6c1ca362411f42afc22bb4c08082d03b636
parent257a9a87d49a6bda05e9d18940152213fd156f0f
am 257a9a87: (-s ours) am 81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '257a9a87d49a6bda05e9d18940152213fd156f0f':
  Import translations. DO NOT MERGE