OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Fri, 28 Jul 2017 23:20:55 +0000 (23:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Jul 2017 23:20:55 +0000 (23:20 +0000)
commit4896c548b494c8dcfae2316d41bd2fe9cd4838af
tree57bb673368e2a3ecfcb5e882e3896b478d8fcde9
parent6581ee886a93f2fd1125553500c537cbaa9deeb6
parent869a72294dbbdf4b56e99059f3f156727dcd0492
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 869a72294d  -s ours

Change-Id: Ib32b6e81aaa755736ea9ac810b6349c6a750ac3a