OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBaligh Uddin <baligh@google.com>
Wed, 8 Jun 2016 13:10:41 +0000 (13:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 13:10:41 +0000 (13:10 +0000)
commit25ad61262e37781df3180f28582d596e7d4766dc
tree0b7a7fc0a6ebc1618d4c0d46a1d0aa2d3db8e2a9
parent74323832def211b4889db7cece57246af6d8129e
parent64d6fddc4b0fc85e679fc17fca9af7896e68521c
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 64d6fddc4b  -s ours

Change-Id: Ica64b4dbd45e67e8ed9bcad575126aaccb2bbf17