tree 46380a579b4d94a4af624c6ff8840b8e869c63bc
parent 892c8a4eb7035b30e74217b94cb2a5209c1d05dc
parent 7352c5e6138e7bb0fb26edbacbb0543712809a0b
author Bill Yi <byi@google.com> 1479692024 +0000
committer android-build-merger <android-build-merger@google.com> 1479692024 +0000

Import translations. DO NOT MERGE am: ff30bb073a  -s ours
am: 7352c5e613  -s ours

Change-Id: I84b504345814c3ec4fcf9c1538a834c652ff3547