tree ffb64050202d1e3204ddcef82cfa71a430f6b9e6
parent e988840a88c12ba7f484afbfcf8345ff1cd75b8c
parent 92ac9041c1b8ad9e427060a4cd00b62163b9beba
author Bill Yi <byi@google.com> 1479692248 +0000
committer android-build-merger <android-build-merger@google.com> 1479692248 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cf589f523a  -s ours
am: 92ac9041c1  -s ours

Change-Id: I905cc7cc9acbf5cc97d35cea376c0a5d83fcd335