OSDN Git Service

Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 0555bb3003...
authorBill Yi <byi@google.com>
Fri, 17 Jun 2016 21:17:26 +0000 (21:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 21:17:26 +0000 (21:17 +0000)
commita1e847b610dab807b35aeefec65aa2e20c969296
treef81e1a7191cd384e35fee56653df3d8ddc41fd50
parentcb33c1b8b0305a5eb0d542ad4a8e845a95caaf95
parent346dd4881dd9f082dd0047c12b52b6e7698a8895
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 0555bb3003  -s ours am: 6abeadf69d  -s ours
am: 346dd4881d  -s ours

Change-Id: I3f0ec3d802dbc153f2b9dac7e56e149eade968b4