OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
authorBill Yi <byi@google.com>
Fri, 1 Jul 2016 05:04:08 +0000 (05:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 05:04:08 +0000 (05:04 +0000)
commitcee545ed443cb8f8dfe3508988f2a59579e0717c
tree51fbbf5b8f8f5f12fc209caea2b1cf2ad3c82f91
parent273eac9b755f884b88afa8b7af516818f74f4247
parent9d3c51d66fbaf090f419f78a3fb2864852ad63ae
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 9d3c51d66f  -s ours

Change-Id: Ic0c5b7a3a8cd712208857abe3fb9605e899475c5