tree 3d880e7042b7414146ecbcee6ae17e472870c831
parent d85854558a3c77c20b59841dbf4ba99a015679b3
parent db360b65d40de8fa3810d785e32c2ba58f1c48ef
author Bill Yi <byi@google.com> 1469812993 +0000
committer android-build-merger <android-build-merger@google.com> 1469812993 +0000

Import translations. DO NOT MERGE am: d730a04ef7  -s ours
am: db360b65d4  -s ours

Change-Id: I4211b1db174ac9a182fb68af2f91674ee99c15ee