| commit | 55e97990b9a0bf6c88724660993864cf7c0bb6af | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Wed Sep 02 18:08:53 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 18:08:53 2020 +0000 |
| tree | 5db9ae1906438971c6992ef795850542ab8ef969 | |
| parent | 77f98132cd647a6b3bcae1d3e1b83c95fac72666 [diff] | |
| parent | 4a8a1ab4b4fb3c9abdbc85b44a738e356ff01a9b [diff] |
[automerger skipped] Merge "Enable annotations for framework stubs" am: 680906b2c3 -s ours am: 4a1dceff0a -s ours am: 54a9b57203 -s ours am: ace83ac241 -s ours am: 4a8a1ab4b4 -s ours am skip reason: Change-Id I4fc66d607276ff885947489afd63e1370ec85939 with SHA-1 01ff6b243f is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418009 Change-Id: Idf63c6db1f0c35a4821036c47bfa2979665a3e92