tree 55d13f3f74ea58f99917f31bd4b2986c1fb0c346
parent c4c7942ee2be8d1295f4aedb8a526e927fc1c10c
parent ade9e011a8131767dce09498bff407f0b04933d4
author Bill Yi <byi@google.com> 1476436682 +0000
committer android-build-merger <android-build-merger@google.com> 1476436682 +0000

Import translations. DO NOT MERGE
am: ade9e011a8  -s ours

Change-Id: Iee7cdf3066efea6cb75c40b908117ddeb19d1b52