tree 57b59b5d0fb233cc626f7f09a3dc2dbb7d87b05c
parent 49ebbb09782092adda70353caf56968e038451b8
parent 51e5a3ccd8770acef4abab22eecdf565730fc1d6
author Bill Yi <byi@google.com> 1464999838 +0000
committer android-build-merger <android-build-merger@google.com> 1464999838 +0000

Import translations. DO NOT MERGE am: 431ffdc8d6  -s ours am: 3e1848fda5  -s ours
am: 51e5a3ccd8  -s ours

* commit '51e5a3ccd8770acef4abab22eecdf565730fc1d6':

Change-Id: Idc971a61f90cd1b018d87f5f982462af8dd2fbdb