tree f266c339554b7dcd2dc99f16d1a3f19d779c0388
parent a778addbc37fc4e75c8ed63b1d99e0ddea2714c9
parent 871fd84ab32b00994161a70f49b1f055e6f415cb
author Bill Yi <byi@google.com> 1476982199 +0000
committer android-build-merger <android-build-merger@google.com> 1476982199 +0000

Import translations. DO NOT MERGE am: 4bfccb32a7  -s ours am: 4559d2bfac  -s ours am: d0c5d246c8  -s ours
am: 871fd84ab3  -s ours

Change-Id: Id56b66ff193ce4a462f1e848a3ca5b5d4f8924eb