OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
authorBill Yi <byi@google.com>
Fri, 1 Jul 2016 05:06:20 +0000 (05:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 05:06:20 +0000 (05:06 +0000)
commitc6d161425b39568c60a098f5657cc3f19c3fb506
tree51fbbf5b8f8f5f12fc209caea2b1cf2ad3c82f91
parent2c7f1130e4d558ab5037cdefacc8d206fecb68cd
parentda696a6d9c0d89dd75b13d9ea67e24684a9fe05b
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: da696a6d9c  -s ours

Change-Id: I678bfc3f73fcd3ba021313201af7534f8559f8f2