| commit | e2a320a1bd1325f57d6f65384c63d60084eeb9f2 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Sep 13 21:22:10 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 13 21:22:10 2021 +0000 |
| tree | f088f7a2450a5d215e4b863699272f98c73d9a15 | |
| parent | 4e2f5320abddf41d8d3a7b12b2937950abd636b0 [diff] | |
| parent | 7e0411b57e30a039da056e0dcee5cd04e19bd2f4 [diff] |
[automerger skipped] Merge "Update manifest to account for new startup library" into stage-aosp-master am: 902b8e2df5 -s ours am: 7e0411b57e -s ours am skip reason: Merged-In Ia896ab92921807a343482c080f8e45b117596ba2 with SHA-1 67126425ab is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15799473 Change-Id: Ie2322291161f254c218dba6f1e5487a8fee018e1