tree a9c35efcf381f9c21364d2d1492ca9d69bd31986
parent 2e0e2c4cb08eb0d10fb15c6ade4361a1d0028cc2
parent f5b4b7d6efbdf0451aa13bc89a80599704529b96
author Bill Yi <byi@google.com> 1481039574 +0000
committer android-build-merger <android-build-merger@google.com> 1481039574 +0000

Import translations. DO NOT MERGE
am: f5b4b7d6ef  -s ours

Change-Id: I93ea971ba3861d2130f288f08af0fc6c1ae12168