OSDN Git Service

am 060b2ce9: (-s ours) am e7961129: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 15:25:25 +0000 (15:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:25:25 +0000 (15:25 +0000)
commite30f773ca54de3616cd1eeb935c871b60268b3c7
tree6c609b081811e1254fb40632f46a01b37d5b2917
parentb6dae108b33381f4478781136b0dc395fde38136
parent060b2ce9eaf77155024676f419ca37aa6c5ab895
am 060b2ce9: (-s ours) am e7961129: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '060b2ce9eaf77155024676f419ca37aa6c5ab895':
  Import translations. DO NOT MERGE