OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 12 Aug 2016 09:31:55 +0000 (09:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 09:31:55 +0000 (09:31 +0000)
commit545c97d0b826474e5cda57ed97a20aefb0c0ce8f
treea0056c94189714112f323a7d8e53ce6d52ae2d02
parentd9435670079bc292afa81a0e6f8f332323869337
parent438c3cbffefada088b98d0953a9dfb8d287aa061
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 438c3cbffe  -s ours

Change-Id: I1678c90c02ce16239aabcbf66aa3573d33ea1fca