tree 91c5e34c4cbfcdaa296a6b2326d50a5bd7c6cfb2
parent 8476c060044bbe99a21a33824797341bdbf858a9
parent c60be93eefbcc3fb04dcb9214f443d02170dafa1
author Florian Mayer <fmayer@google.com> 1619103917 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619103917 +0000

[automerger skipped] Merge "Revert "API changes as requested by API council."" am: 6b4ecd94c1 am: 5e3ed6416a am: c60be93eef -s ours

am skip reason: skip tag Change-Id Ie465c49ff02065e78a2e8e211a13350a0ff7f0a4 with SHA-1 c89513ac27 is already in history. Skip tag was found from reverted change Ie465c49ff02065e78a2e8e211a13350a0ff7f0a4

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

Change-Id: Ia88aaa911d641d634a00860f5f172a665ecd3bcb