OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 65266b99d2 -s ours
authorBill Yi <byi@google.com>
Thu, 16 Jun 2016 10:08:55 +0000 (10:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 10:08:55 +0000 (10:08 +0000)
commit7c00e15378cb370c2052be0d9fe5b66ec17c7dc0
treef600a700a723368b495094007267a629368cef8f
parent206ac49f44c34fc42fa0e76ef5a9ef0c7f6e215e
parentf924f2130f0763ba68fd17292be904cda392e2ec
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 65266b99d2  -s ours
am: f924f2130f  -s ours

Change-Id: Ie9b5a6e2814d4e7f7b7146c677aeed6932c5b11c