tree c9ffa859d46f723e7d81f50ebbb3368bdd7a1fc4
parent bb625889e410dc6e13573489673ccbd6d97a857b
parent f13c6c2a4c9d098d95582caee985b43f21d39c4b
author Bill Yi <byi@google.com> 1491123276 +0000
committer android-build-merger <android-build-merger@google.com> 1491123276 +0000

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

Change-Id: Ic6c474944a6a0a6b0a1a301f3ccd4a8e891ff073