OSDN Git Service

Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 79c9b301ee...
authorBill Yi <byi@google.com>
Fri, 1 Jul 2016 05:33:51 +0000 (05:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 05:33:51 +0000 (05:33 +0000)
commitd0b4d42dcb19ed0eea331e580fdb10dd09624cce
tree6316c6e0c6ddc338068e3e82819de02d28bb4f4b
parentbc2750806d97dd3b79497f08a5447b5d46526105
parent7f553a4b268047a63df7e000e86ba3784dfd1e59
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 79c9b301ee  -s ours am: 37da5078c0  -s ours
am: 7f553a4b26  -s ours

Change-Id: Ie3993771d67d7dffe7b3b28c7a50c9ecd9f6fc75