OSDN Git Service

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 812794f0f5 -s ours
authorGeoff Mendal <mendal@google.com>
Mon, 16 Nov 2015 17:50:57 +0000 (17:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 Nov 2015 17:50:57 +0000 (17:50 +0000)
commite490a14629561e3d61f679bbaaad6ba4723a1c15
treeeaa56164b1199bac8a54040ecbd62fb7491bf184
parent5482308a0a41a7bb25a8bdabd88676eee02254b1
parentf39bb92f5a90b9d3e2e958535c16eee5a7aacd97
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 812794f0f5  -s ours
am: f39bb92f5a  -s ours

* commit 'f39bb92f5a90b9d3e2e958535c16eee5a7aacd97':
  Import translations. DO NOT MERGE