OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 4ecc9d2db4 -s ours
authorBill Yi <byi@google.com>
Fri, 19 Aug 2016 15:42:53 +0000 (15:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 15:42:53 +0000 (15:42 +0000)
commitd789b8aac0c1be01e5c341568f297f8d1f586d11
tree95eac66b15e1f90abd34b7a6081bb4ce5249aca9
parentc9731879e5247a31c941257d7c8e49a63b81227d
parente35215cec751f4b679781c6b2a2fb5b6639c7732
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 4ecc9d2db4  -s ours
am: e35215cec7  -s ours

Change-Id: I76e05f0850240a1b39ade0ad8c9e20dd60a51f64