OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
authorBill Yi <byi@google.com>
Fri, 1 Jul 2016 05:09:18 +0000 (05:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 05:09:18 +0000 (05:09 +0000)
commit5678f94efbaeb428b80b0ef01ef0ca074a47a6de
tree51fbbf5b8f8f5f12fc209caea2b1cf2ad3c82f91
parent37da5078c007ee5ae7de45de6c054281e6ff0bb5
parentaac5c0e427e639f996e42e73ca736a2798d1a3f2
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: aac5c0e427  -s ours

Change-Id: I5ba367cb854039a4de86a36808296242e0258e3d