tree dfab1c43792d14bd9ce7805eb155b912ac1c356e
parent e887176695201cd5b58516257f2a427479ad425b
parent ad013e1c68574d750618c7c6e1c0a0a338f5489c
author Anton Hansson <hansson@google.com> 1561738402 -0700
committer android-build-merger <android-build-merger@google.com> 1561738402 -0700

Merge "Remove ro.url.legal* props from proto" am: c4fdd9ac1d am: 3b47b26fe3
am: ad013e1c68

Change-Id: If1b207e3eb05cf05d0890dd5e5d4fa4edbf5e5e2