tree 05053477d4038f2eaa5d2a9ee55d3a38eb6177c6
parent 621ef3fa1c09c306508ab688881ca0d694351c65
parent 68a3e65ecdc51386c44699903fb696f35bf8fedc
author Bill Yi <byi@google.com> 1512077002 +0000
committer android-build-merger <android-build-merger@google.com> 1512077002 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 18fd5109c9  -s ours
am: 68a3e65ecd  -s ours

Change-Id: I10fac2255546543b6d52c3953dd3c0070a3544f4