tree 05053477d4038f2eaa5d2a9ee55d3a38eb6177c6
parent db28fe1e7df9dd0a3c9c324e43978362df801fa6
parent 0911a97fc276f074fdbe8747f054ed9a77d02c99
author Bill Yi <byi@google.com> 1512080214 +0000
committer android-build-merger <android-build-merger@google.com> 1512080214 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c168312e92  -s ours
am: 0911a97fc2  -s ours

Change-Id: Ifa5d3eca8a9fbcd614faa63bedf8f76d2bfcf926