OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 689366fe33...
authorBill Yi <byi@google.com>
Fri, 1 Jul 2016 05:11:04 +0000 (05:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 05:11:04 +0000 (05:11 +0000)
commit488281e3363e0764b7a4dde2f8bd058857e59669
tree718f9de5999d4d5756d3a5b698802fdd9b3909c8
parent4076e502e794ef6c6bccd59bfd148724666bf7cc
parent2c7f1130e4d558ab5037cdefacc8d206fecb68cd
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 689366fe33  -s ours
am: 2c7f1130e4  -s ours

Change-Id: I887b1a63787c871651ffa1cd420bcb99941e291a