OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: da696a6d9c...
authorBill Yi <byi@google.com>
Fri, 1 Jul 2016 05:14:00 +0000 (05:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 05:14:00 +0000 (05:14 +0000)
commit24b6f4efe1128b18e85361360244e0137a759f6e
tree718f9de5999d4d5756d3a5b698802fdd9b3909c8
parent488281e3363e0764b7a4dde2f8bd058857e59669
parentc6d161425b39568c60a098f5657cc3f19c3fb506
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: da696a6d9c  -s ours
am: c6d161425b  -s ours

Change-Id: I72cf16e96522446538147bd99310c7d71f960239