| commit | 54a9b57203dcfda6bc5ed02a6f91a1ec44a03b79 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Wed Sep 02 16:01:14 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 16:01:14 2020 +0000 |
| tree | 82e1fa40059b27287458ee58f10281ab2364b024 | |
| parent | fdf080faf6d0e74103316083405ecc516f1756b4 [diff] | |
| parent | 4a1dceff0abb56f3e9f3dd4494c3ff69c52bcfb8 [diff] |
[automerger skipped] Merge "Enable annotations for framework stubs" am: 680906b2c3 -s ours am: 4a1dceff0a -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: I547e5f944cce38dc09b8d3e4fef7f77338139489