OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 12 Aug 2016 09:38:33 +0000 (09:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 09:38:33 +0000 (09:38 +0000)
commit7b1062da759d9cc2841103ea7a867f453298e0d2
treef008b38fae14fe9edb155376a1855f121963fb86
parente24aef7907a14d5d688f78a0913ca65de63514c5
parent99b590df3e321ec6548798205ae559bb35f54eb9
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 99b590df3e  -s ours

Change-Id: If09ddaa056c14936d86b11a369a7a2a31025f057