tree c9ffa859d46f723e7d81f50ebbb3368bdd7a1fc4
parent 61392204558ecd080a426a60135a1c774290965a
parent e1a2ddeee868e22ed6ffafefa3b0495b2f3238c5
author Bill Yi <byi@google.com> 1491123694 +0000
committer android-build-merger <android-build-merger@google.com> 1491123694 +0000

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

Change-Id: Ic3d74dd044e7da852eeea96744c209d3741a00d5