tree b3ea779b512c50c009ec91c1cdfedf412619aa2f
parent 51650365a401804a4b8f510c47d378016fd2eb81
parent 8758da732f64bce9767bd44e0e89b8e5f8f006e5
author Bill Yi <byi@google.com> 1477136816 +0000
committer android-build-merger <android-build-merger@google.com> 1477136816 +0000

Import translations. DO NOT MERGE
am: 8758da732f  -s ours

Change-Id: I574899dc90e63b25b249c75dfde0e87c7b590621