tree 1a94d2393748b061aada9d5abe1fb58710874212
parent 753a9ab308da5e0bc4e55f1b5bb21688562f5a04
parent 7e3f20e24979f7b807eef7dd2c6da6b7ecb8681b
author Bill Yi <byi@google.com> 1508133565 +0000
committer android-build-merger <android-build-merger@google.com> 1508133565 +0000

Import translations. DO NOT MERGE am: b081f1e809  -s ours am: 43b03fbacf  -s ours
am: 7e3f20e249  -s ours

Change-Id: I81957a7142c7ee4f702e4895bdfebdb190750367