OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBill Yi <byi@google.com>
Thu, 30 Nov 2017 22:11:12 +0000 (22:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Nov 2017 22:11:12 +0000 (22:11 +0000)
commit5dfa99ab35044f24cb5e358e61e408596571b22f
tree62d787e248df0cf368e0546c1926f772c2fe0f99
parent0ccbbfa9901427085808bf8c7ffc7a6e5d20bf49
parent1536c4ed80048eff8920a59ae093d483466a25dd
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 1536c4ed80  -s ours

Change-Id: I6ebc82f3feff22872f2a94f6f52b56300a096517