commit | 245bbc13bebfd8ab0171adf4ea5697983b83c108 | [log] [tgz] |
---|---|---|
author | Mohammad Islam <samiul@google.com> | Tue Sep 28 16:30:12 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 28 16:30:12 2021 +0000 |
tree | 5e57f55154e8065ce76f54465983653ca4db2563 | |
parent | a9e9da6123e3ae6e3b71d266d7d4b30c8302fa52 [diff] | |
parent | 61cdc7f9a820de8dc53d415c8c89e2f3eae6daa6 [diff] |
[automerger skipped] Merge "Fix broken test on GSI branch" am: 0fe46d947a -s ours am: 430ef242c4 -s ours am: efa70ccb43 -s ours am: 0b3fa2a944 -s ours am: 61cdc7f9a8 -s ours am skip reason: Merged-In Ibdd72ec062538838ad60b847ee1ff31a792520a3 with SHA-1 ecafad4383 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1836298 Change-Id: I4d2ab33133bfb3ea5d773736fe202a6ab8bc13c8