OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c035f28175 ...
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 15:55:28 +0000 (15:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 15:55:28 +0000 (15:55 +0000)
commit9cfc3f1ec31b44bc1e232d5755226d9efa3e2779
treee4cdcce4e72fc0f8adbc0501ca902a5f67ca8d3e
parent4ee7b8af83a1e47b480258671a31479caa2a69ca
parentae6151eceffcb5d2dbc4fb2d1bea893f4432a017
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c035f28175  -s ours am: 770e4008b2  -s ours
am: ae6151ecef  -s ours

Change-Id: Ie45ce84c781af3e97cc80df0ff81365eb34470a1