tree c9ffa859d46f723e7d81f50ebbb3368bdd7a1fc4
parent c29576d8aba7adb27d0c7b4a09a4b3488984f1be
parent bcd194eb04e6e6c2d3f194381cb1227e7be39090
author Bill Yi <byi@google.com> 1491123911 +0000
committer android-build-merger <android-build-merger@google.com> 1491123911 +0000

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

Change-Id: Ide3209a7be2b5f32cced831c4bfb0f4ae8e1b278