tree 32c6eb7e51b07678c1266fd5899e44931e070e0a
parent d7307321dde6641a9353b011c10cb97ed419d4f5
parent c33abb73bcbcb93ccaa163ce00f5deacbc92b481
author Bill Yi <byi@google.com> 1499743326 +0000
committer android-build-merger <android-build-merger@google.com> 1499743326 +0000

Merge "Import translations. DO NOT MERGE am: 28b67f8eea  -s ours am: 9839965b25  -s ours am: 7e05669aba  -s ours" into oc-dr1-dev-plus-aosp
am: c33abb73bc  -s ours

Change-Id: I595fc1bbe2235ffcb5809423d94f89383ae82976