| commit | a09bb9a37c4077cb716109575b54b82156728dbf | [log] [tgz] |
|---|---|---|
| author | Jihoon Kang <jihoonkang@google.com> | Thu Aug 17 04:16:26 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 17 04:16:26 2023 +0000 |
| tree | 81dd13da086efeb4309f66494181f1a946251509 | |
| parent | a151e4b31392846013b8736efcc832ebab45d0e5 [diff] | |
| parent | 78401e7ef5d975496f6f7d3d437d63c66418a6e1 [diff] |
[automerger skipped] Merge "Revert "Move java_api_library modules to f/b/api/StubLibraries.bp"" into main am: da656f1b50 am: 7704a2e7b4 am: 0b767009a2 am: 7262f41265 am: 78401e7ef5 -s ours am skip reason: Merged-In I479ec3b1554dcc6630207c5f095c6f9d211b035b with SHA-1 1f40645e9f is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2655262 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2713676 Change-Id: I719456dfef5672ccf20f0997fe4b096a229c9c9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>