| commit | 4a1dceff0abb56f3e9f3dd4494c3ff69c52bcfb8 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Wed Sep 02 15:51:14 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 15:51:14 2020 +0000 |
| tree | 522688791aa23d738f50a4f5b2bd41317f7521c0 | |
| parent | b578134162d8fe065fb9bb14e2ff719565541f0f [diff] | |
| parent | 680906b2c3d2f189141ab519719533ee3951942d [diff] |
[automerger skipped] Merge "Enable annotations for framework stubs" am: 680906b2c3 -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: I1e72fe622f78933f345c6cc7473d6f59dd9b306f