OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 779722d -s ours am: 18835...
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 15:37:42 +0000 (15:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 15:37:42 +0000 (15:37 +0000)
commit508f65a797825d0f15c4160cc0f5876d52831265
tree45112cd50c1e6f3b0b2d817725e9de3a049a7a32
parent938285d82d413d3fa2246609a14c75e1fa29d5b5
parent0ae03ae8a9f1273120a7bfe39f171b8ba7f72497
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 779722d  -s ours am: 1883509  -s ours
am: 0ae03ae  -s ours

* commit '0ae03ae8a9f1273120a7bfe39f171b8ba7f72497':

Change-Id: I1b5e3d082a2a2426539c26287b01fbfedd89599f