OSDN Git Service

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
authorGeoff Mendal <mendal@google.com>
Wed, 3 Feb 2016 11:09:58 +0000 (11:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 Feb 2016 11:09:58 +0000 (11:09 +0000)
am: 762829795f  -s ours

* commit '762829795f52c701f244550ec142fbd35a631a28':
  Import translations. DO NOT MERGE


Trivial merge