OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Sat, 3 Mar 2018 13:18:11 +0000 (13:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 3 Mar 2018 13:18:11 +0000 (13:18 +0000)
commit5f311906c0947d113db25093949d8ef9da6b585e
tree3a2b10641713471361533f713126f63309c6087e
parent5c9582b4174b1d5452d1a11d82c27f65db931f68
parent5b67a302d4e841a2065eb89f99d319cad2fcde7b
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 5b67a302d4  -s ours

Change-Id: Ieab93fb1ab78ad5633e328eee9c59616239ea487