tree 238940a6753929c045802821e2700595c944c1d0
parent b26929bc6094fcc9fc2c7a0c9d9a742f825f10d1
parent f6ec8d4d52f3766fd127ede6d1bc9ae3d53d505e
author Bill Yi <byi@google.com> 1467323896 +0000
committer android-build-merger <android-build-merger@google.com> 1467323896 +0000

Import translations. DO NOT MERGE am: 0d633224f5  -s ours am: 87bd98e46f  -s ours
am: f6ec8d4d52  -s ours

Change-Id: I974f6f79de8a79731e27d08732cc72f917f13de3