tree fa770ebc1c4e0b48852c19501b4e84c9aeffda3e
parent 22d3459a675064d823c3e9d4a0b08d9198b2a42e
parent 695256240e4b6f3e1342fb934117d7b236128813
author Bill Yi <byi@google.com> 1475608030 +0000
committer android-build-merger <android-build-merger@google.com> 1475608030 +0000

Import translations. DO NOT MERGE
am: 695256240e  -s ours

Change-Id: Ic8692b9fd398b987ba8278614b86aea71fc52f2a