tree 51e25d7943ce2bc164e2728e4754c2a74edcc553
parent ba3ba4b9150f1374fd018dfe260a48299bb676f7
parent 3b47b26fe3e6c523a42707672a9f9d86d0be33f9
author Anton Hansson <hansson@google.com> 1561737977 -0700
committer android-build-merger <android-build-merger@google.com> 1561737977 -0700

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

Change-Id: Iefa4f434b5c7898e18cfe1a991e53287b6e55c3a