OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 9d3c51d66f...
authorBill Yi <byi@google.com>
Fri, 1 Jul 2016 05:11:02 +0000 (05:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 05:11:02 +0000 (05:11 +0000)
commit4076e502e794ef6c6bccd59bfd148724666bf7cc
tree718f9de5999d4d5756d3a5b698802fdd9b3909c8
parent717a49250e561f258a6d51be816c7d7661cc1ffe
parentcee545ed443cb8f8dfe3508988f2a59579e0717c
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 9d3c51d66f  -s ours
am: cee545ed44  -s ours

Change-Id: Id25b2ed05738007f3ba990b9deb527ccaf15448c