e4ff5ff6709fcfb72634b6d8c3ef1eff58a09bb2
be7735efcb am: 5b62c51502 am: 8c10a6aa0d am: e35d11225a -s ours am: c5b180548c -s ours am: 135412cd52 -s ours
am skip reason: Merged-In Idf1ab60878d619ee30505d71e8afe31d8b0c0ebe with SHA-1 1325574d3a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071224
Change-Id: I6c32001ff5576d93ca1f6d227380dd7fe502305e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Revert "[AppsFilter] read-only interface for snapshots"" into tm-dev am:
b1f0535c06 am: 60246609de
…
…
Merge "Inform the remote provisioner when a key may have been consumed" am:
ca344c9949 am: dc13e716c4 am: d085caf2b3 am: d4530a83ef
…
…
Merge "Update data type and comments on tagSocket/untagSocket APIs" am:
ef89731cd3 am: aa82affbc0 am: 292d5f01ec am: 72d6df3c6f
Merge "Prevent exfiltration of system files via user image settings." into sc-dev am:
be7735efcb am: 5b62c51502 am: 8c10a6aa0d
Merge "Migrate rs/jni to Soong" am:
eaebd2cd54 am: a6f5cf56e8 am: 21587435c7 am: 22b41229f1 am: 87bbc3ef20
…
…
Merge "Revert "[AppsFilter] read-only interface for snapshots"" into tm-dev am:
b1f0535c06 am: 60246609de
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%