tree 876110d57ed3458fff1259b8de85c54b17aa38ca
parent 15a4228916b557b128e2a014edd94ab0d4f5c79b
parent ea79b5e4b9f2dbe1f9ca5a2b7e05ca2ac2bf2ab5
author Bill Yi <byi@google.com> 1481789410 +0000
committer android-build-merger <android-build-merger@google.com> 1481789410 +0000

Import translations. DO NOT MERGE am: 1e0cc808ab  -s ours
am: ea79b5e4b9  -s ours

Change-Id: I8bbf684868532c604f8100d23efc7f192c7e8703