| commit | d8e63d203ce5171a820f8102106a3ab90d02cf42 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 13 21:11:55 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon May 13 21:11:55 2024 +0000 |
| tree | be3d3b0a10608dd1ea7f744dc0372ba40073cd61 | |
| parent | c9cfb36ae1e5b5629c46cd5734d6516c056366cc [diff] |
Update git submodules
* Update frameworks/base from branch 'main'
to 2536ea06a426182c51aa31c78091aa24dbad183a
- Merge changes from topic "am-70d7c5523393494f9738846a0863736f" into main
* changes:
[automerger skipped] Merge "HDMI: Update OWNERS" into android14-tests-dev am: 42dcf1927e -s ours
[automerger skipped] HDMI: Update OWNERS am: 48911ffffd -s ours
- [automerger skipped] Merge "HDMI: Update OWNERS" into android14-tests-dev am: 42dcf1927e -s ours
am skip reason: Merged-In I8aed84fab3b5f12e781f3834a087e186c6f61cca with SHA-1 98332a780f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3082819
Change-Id: I23760e40fb57be991c4ca7e2722c40f22fc844c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
- [automerger skipped] HDMI: Update OWNERS am: 48911ffffd -s ours
am skip reason: Merged-In I8aed84fab3b5f12e781f3834a087e186c6f61cca with SHA-1 98332a780f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3082819
Change-Id: If3cc3b96f515d9222a0d04a5f0de4316d1ff1f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
- Merge "HDMI: Update OWNERS" into android14-tests-dev
- HDMI: Update OWNERS
Bug: 336807339
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0a05dd541c34dcd5d60f2cbc43c2471d7952e900)
Merged-In: I8aed84fab3b5f12e781f3834a087e186c6f61cca
Change-Id: I8aed84fab3b5f12e781f3834a087e186c6f61cca
(cherry picked from commit 98332a780f64871f40b23d51493e722c37328441)