OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: baedc65a8b...
authorBill Yi <byi@google.com>
Fri, 1 Jul 2016 05:11:00 +0000 (05:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 05:11:00 +0000 (05:11 +0000)
commit717a49250e561f258a6d51be816c7d7661cc1ffe
tree718f9de5999d4d5756d3a5b698802fdd9b3909c8
parenta56683cda2c294f8c9ea588038c9d66dde1fd0c5
parent273eac9b755f884b88afa8b7af516818f74f4247
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: baedc65a8b  -s ours
am: 273eac9b75  -s ours

Change-Id: I8dd4427627c41546e1fdb36cbfff2db7798766c7