OSDN Git Service

Merge "Import translations. DO NOT MERGE am: d341e0f050 -s ours am: 05af4b26b6 ...
authorBill Yi <byi@google.com>
Fri, 2 Sep 2016 20:03:00 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Sep 2016 20:03:00 +0000 (20:03 +0000)
commit6bf906c13ef72cb0860898b76cf95b9b39496611
tree7587b78ed0259a06b2cd106dd02f7dfc98022cb5
parent4ee70506cdd1b4031e1a587d0aa54fcd01a02d11
parent2db43d665c15da806fcfe512703537d57f27403c
Merge "Import translations. DO NOT MERGE am: d341e0f050  -s ours am: 05af4b26b6  -s ours" into nyc-mr1-dev-plus-aosp
am: 2db43d665c  -s ours

Change-Id: Iec05636e87486b380b1aaa28da37a38f7316b2d1