tree d37aa9fbeb45b902598b2628bab1bc28b68a60ca
parent 1fdd96f52a1a90826408b348ac6428260ad643bd
parent e988840a88c12ba7f484afbfcf8345ff1cd75b8c
author Bill Yi <byi@google.com> 1479692491 +0000
committer android-build-merger <android-build-merger@google.com> 1479692491 +0000

Import translations. DO NOT MERGE am: 9a4ff5a900  -s ours am: 8d7399f553  -s ours
am: e988840a88  -s ours

Change-Id: Ic1043352cf85cfda24ba42a3bb03810704ef165b