OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb8c569414 -s...
authorBill Yi <byi@google.com>
Fri, 27 May 2016 19:48:49 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 19:48:49 +0000 (19:48 +0000)
commit72f2dd21876205ef0e0c14a8f7c3b422c58855d9
treea70b40ab9a460fd635ed37320517a32a6852a6cb
parentf9508873dd67f34a79ab04128010768dd147aca6
parent902c693bae6c3f432dd72f3b55680e13632bf928
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb8c569414  -s ours am: 8272bb6af4  -s ours" into nyc-mr1-dev-plus-aosp
am: 902c693bae  -s ours

* commit '902c693bae6c3f432dd72f3b55680e13632bf928':

Change-Id: Iadd1aa8f179fec25ff8a9b0ef72698c2fd847b30