OSDN Git Service

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

Change-Id: Icc0fb526666ab153a18521d6d376914c61636328