tree eeae2e65955b9bf8ce2452d8f5c66f6d664189d6
parent 521cb5949f7019206146648d23a8e76671df0313
parent 6b4ecd94c1ed13a4b11f1cf9e26af500ccbd9cd1
author Florian Mayer <fmayer@google.com> 1619101181 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619101181 +0000

Merge "Revert "API changes as requested by API council."" am: 6b4ecd94c1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683628

Change-Id: I69e1d7a9f3d5733248262187298dd22d2242a1ad