tree fab58a6b3f7e1f85569b6c74ee9eba696850b21e
parent 5174575673aabe5a8497e3e5585d4f192939b327
parent 41afb7661ba83b2d5106584bbbd053a2a72f03ef
author Bill Yi <byi@google.com> 1459439312 +0000
committer android-build-merger <android-build-merger@google.com> 1459439312 +0000

Import translations. DO NOT MERGE am: a82e26a  -s ours am: 67afd9c  -s ours am: 44d42fe  -s ours
am: 41afb76  -s ours

* commit '41afb7661ba83b2d5106584bbbd053a2a72f03ef':
  Import translations. DO NOT MERGE

Change-Id: I1f4ce8b28142770b1d7ed5f1758c6d373d790a70