OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
authorBill Yi <byi@google.com>
Fri, 1 Jul 2016 05:03:55 +0000 (05:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 05:03:55 +0000 (05:03 +0000)
am: 914376787b  -s ours

Change-Id: Ieef4f72f12ba13dbc1d0a13bdfae94729f4c87d8


Trivial merge