tree 05053477d4038f2eaa5d2a9ee55d3a38eb6177c6
parent d91db745316b5f2cb499798f17ae8ebe836e0f27
parent 5dfa99ab35044f24cb5e358e61e408596571b22f
author Bill Yi <byi@google.com> 1512080827 +0000
committer android-build-merger <android-build-merger@google.com> 1512080827 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1536c4ed80  -s ours
am: 5dfa99ab35  -s ours

Change-Id: I26f1ed19c9ce428ca835e4f4db33f36bb71be8e1