OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBaligh Uddin <baligh@google.com>
Thu, 23 Jun 2016 00:43:44 +0000 (00:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 23 Jun 2016 00:43:44 +0000 (00:43 +0000)
commitc446ef54aea9019299ef40640b5e5867bdb4a3de
tree8c5bfff93096f604b2e24ce229b3826c9dd3c91e
parentb91869d35f21a690185e062113c55fb7c39d7bef
parentb9aa9b47e751cf422a00d1987b3e4354624f6010
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: b9aa9b47e7  -s ours

Change-Id: I5c878620d97c3c6e90b3579e1102f56e14a8c6eb