OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:03:58 +0000 (18:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:03:58 +0000 (18:03 +0000)
commitc45aaf531cfd4f17457bb8cbbaf1ca31fbf08344
tree6e84bc3413e99d3d9ac0583dd9e01b9ed0f3eddc
parent9dfb1b6797b031b75486b1e96f1683ced4ff7cc2
parent9353cf10ba3b52908b1185c5b61f543100ac8fd7
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 9353cf10ba  -s ours

Change-Id: I536fcb3b49875f04f45beadf0b252c96ee1ed04c