OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941 -s ours am...
authorBill Yi <byi@google.com>
Thu, 21 Dec 2017 19:20:42 +0000 (19:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Dec 2017 19:20:42 +0000 (19:20 +0000)
commit59f4b0c11f905a9bc8d2d38bc3daf9540c83dd5b
treebb220531b379d75f755bf4ab287267e06a610e04
parent37e0c23902483a6189f65e3b876a986c273eee3d
parent39d480e67c0afa6dcb3c9fb78b603d4e5f609778
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941  -s ours am: 51fc07ad61  -s ours am: c344f9b1c7  -s ours
am: 39d480e67c  -s ours

Change-Id: I521cbe71ba8abbaa04deb8e4ae232764687a29d2