OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1536c4ed80 ...
authorBill Yi <byi@google.com>
Thu, 30 Nov 2017 22:27:07 +0000 (22:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Nov 2017 22:27:07 +0000 (22:27 +0000)
commitab8130f29b054d134fb2ec9f814c222dc0aebe24
tree05053477d4038f2eaa5d2a9ee55d3a38eb6177c6
parentd91db745316b5f2cb499798f17ae8ebe836e0f27
parent5dfa99ab35044f24cb5e358e61e408596571b22f
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1536c4ed80  -s ours
am: 5dfa99ab35  -s ours

Change-Id: I26f1ed19c9ce428ca835e4f4db33f36bb71be8e1