OSDN Git Service

Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 9d3c51d66f...
authorBill Yi <byi@google.com>
Fri, 1 Jul 2016 05:18:52 +0000 (05:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 05:18:52 +0000 (05:18 +0000)
commitd1c6fb3c1a745db1b0d2c5e55d4afeff7a0a520a
tree6316c6e0c6ddc338068e3e82819de02d28bb4f4b
parent73e65d7e6de03d73d127dd513342b47742780448
parent4076e502e794ef6c6bccd59bfd148724666bf7cc
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 9d3c51d66f  -s ours am: cee545ed44  -s ours
am: 4076e502e7  -s ours

Change-Id: Ie95845dfb267a2a641be793a5ded082f29a01ff0