| commit | 7e0411b57e30a039da056e0dcee5cd04e19bd2f4 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Sep 13 21:14:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 13 21:14:29 2021 +0000 |
| tree | 2f2946c8dbdfe80f8944772a8faf6e15c19df76d | |
| parent | c7663a5148ef9c2f9570cd9288b0879506e856b9 [diff] | |
| parent | 902b8e2df5484f3267c0be4da9f1151653f02109 [diff] |
[automerger skipped] Merge "Update manifest to account for new startup library" into stage-aosp-master am: 902b8e2df5 -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: I393c347f5d410e884c0c443cff96d4b86dd4b222