tree 008eea3cce9b265becf3248b1c6c0ddc9f8ced78
parent 6577c061fcaab289ed38a4146e89bfe9daaa1afd
parent 3a7c11ba457a9df44c39f1baccb6999c7790f46e
author Mathew Inwood <mathewi@google.com> 1619425851 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619425851 +0000

Merge "Revert^2 "API changes as requested by API council."" am: 3a7c11ba45

Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/1684201

Change-Id: I92f1c79d880622d1fe31f603139e8c4ae75c70df