OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
authorBill Yi <byi@google.com>
Fri, 1 Jul 2016 05:04:26 +0000 (05:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 05:04:26 +0000 (05:04 +0000)
commit2c7f1130e4d558ab5037cdefacc8d206fecb68cd
tree51fbbf5b8f8f5f12fc209caea2b1cf2ad3c82f91
parentcee545ed443cb8f8dfe3508988f2a59579e0717c
parent689366fe339217b8e6c7edc80494cbc4eaf73906
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 689366fe33  -s ours

Change-Id: I6127c59df61f68ba301224d8cf08cba8093fe19f