tree d1aa1c644860a72a84a0aae8ce1a8d6e16d61331
parent 992b5b0dd215ad0df5a94cb7a998b9a1e13729ac
parent 8281767f34d8aaf2af7c19b5ed9fbe81fd23ddbb
author Bill Yi <byi@google.com> 1469073792 +0000
committer android-build-merger <android-build-merger@google.com> 1469073792 +0000

Import translations. DO NOT MERGE am: e49c0d6406  -s ours
am: 8281767f34  -s ours

Change-Id: I8f3d4f4d397bfcd2d0a76d99eefb037343beb593