OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 036c415394...
authorBill Yi <byi@google.com>
Fri, 17 Jun 2016 06:52:35 +0000 (06:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 06:52:35 +0000 (06:52 +0000)
commit35aea9292b7d3ac26be3db3252c8698aaebc7041
tree856679f2d446325190cc3380b24246296a737563
parenta40ae4f0d30161da14fe56ec66ff1ab9c074b7eb
parent9b4f8d1a92e93d07d1ca9cf3f803002b043cb8b9
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 036c415394  -s ours
am: 9b4f8d1a92  -s ours

Change-Id: I3272a8435b0b6da0f3bfa58559d6e1b0e7dbfb14