OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 3aca33df86...
authorBill Yi <byi@google.com>
Fri, 17 Jun 2016 06:54:48 +0000 (06:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 06:54:48 +0000 (06:54 +0000)
commitee05119cc59f61456645e9db666f701be26bee86
tree856679f2d446325190cc3380b24246296a737563
parent37d27a9b7bb0b33e04396e34d11758a92a8ab418
parent3b937e62a29459395c983afd4fd4492e34baa77d
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 3aca33df86  -s ours
am: 3b937e62a2  -s ours

Change-Id: I7b4c98808937fceb88e3cbc8d8b52cbb2a97502f