OSDN Git Service

Merge "Import translations. DO NOT MERGE am: 92bd69b1e7 -s ours am: b1c751fccf ...
authorBaligh Uddin <baligh@google.com>
Wed, 4 May 2016 01:52:51 +0000 (01:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 May 2016 01:52:51 +0000 (01:52 +0000)
commit9c41555aa1c687cebf888945ce4d964d3eabc277
treed831fd7a2642ca8cc027fa7658a22bcf0b74b197
parentd5e37f8e8468eb5065aaec31f7f81ec7cf999525
parenta5594a020e4c8708adda6d0ac5d5ef549cfc126e
Merge "Import translations. DO NOT MERGE am: 92bd69b1e7  -s ours am: b1c751fccf  -s ours" into nyc-mr1-dev-plus-aosp
am: a5594a020e  -s ours

* commit 'a5594a020e4c8708adda6d0ac5d5ef549cfc126e':

Change-Id: I132e508fe73b7d9afcf278fd68b3538380937f1a