OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: d063b809ec...
authorBill Yi <byi@google.com>
Fri, 17 Jun 2016 06:54:44 +0000 (06:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 06:54:44 +0000 (06:54 +0000)
commit7bd5593e048b499356c387421b172ff05c1bb4a1
tree856679f2d446325190cc3380b24246296a737563
parent35aea9292b7d3ac26be3db3252c8698aaebc7041
parente55eb56a85942950bd904bac056de0dc56473693
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: d063b809ec  -s ours
am: e55eb56a85  -s ours

Change-Id: I3dade94e2d10c412a52a5b92533359a749c676fd