tree c4559b4c9c6fe85e88fd9a764dbd90652a0843a3
parent b8704bf4eb34693fee52413c0363eff6b636849d
parent fcf7377d2916670ee9d9b076ae07e86d77a82e12
author Bill Yi <byi@google.com> 1466122050 +0000
committer android-build-merger <android-build-merger@google.com> 1466122050 +0000

Import translations. DO NOT MERGE am: 5910ddb8f3  -s ours
am: fcf7377d29  -s ours

Change-Id: I6d9ad2e14b19ba590c1598d8ff228e9f34a825ec