OSDN Git Service

Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: c52cdca3a6...
authorBill Yi <byi@google.com>
Fri, 17 Jun 2016 21:17:20 +0000 (21:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 21:17:20 +0000 (21:17 +0000)
commitcb33c1b8b0305a5eb0d542ad4a8e845a95caaf95
treef81e1a7191cd384e35fee56653df3d8ddc41fd50
parent40a65a88b1405139b226f7e75dc552539d91bd64
parent7aa97723932ae38b746eb11bc681e45a98d8ac05
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: c52cdca3a6  -s ours am: 0e2f17da9f  -s ours
am: 7aa9772393  -s ours

Change-Id: I829efc7928cce21b88fcee66090a4f41cb7b161f