tree 0b68b273a15b847db3cbafe6bc9e8edb2c84ba10
parent 6d4f59eccbc1eed0bde892934eed81602c06e2e9
parent ca7fbd546c32e2c9fff644d5f9f3e94310cbb0df
author Tom Cherry <tomcherry@google.com> 1575902421 -0800
committer android-build-merger <android-build-merger@google.com> 1575902421 -0800

Merge "Cleanup package_string() and its users"
am: ca7fbd546c

Change-Id: I25902a58a6fb7c3866c19d939647174552d99673