OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBaligh Uddin <baligh@google.com>
Wed, 8 Jun 2016 13:10:44 +0000 (13:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 13:10:44 +0000 (13:10 +0000)
commit26e9a5c9f858b0a2ca5763424d027c9c25354fd6
tree0b7a7fc0a6ebc1618d4c0d46a1d0aa2d3db8e2a9
parent25ad61262e37781df3180f28582d596e7d4766dc
parentc20ea2eb438a47bc0590f046d5765ad3b32b80c7
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: c20ea2eb43  -s ours

Change-Id: Ide205acdf26a282bd80ca2eb68b23f1a442c36a4