1ed5bbda8582bd3c2c7e83ea217edfb8993d572c
f92fa673da am: a1f8e1c584 am: a08368b334 -s ours
am skip reason: Merged-In I6d22205b733cb5d579b8da6f1e66f31437b20db1 with SHA-1 616898d167 is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2051832
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2065671
Change-Id: Id3d5fe871c0991d62b1247784b5f4ceb618ac108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…
…
…
Merge "Clarify doc comment for setUnlockedDeviceRequired" am:
a0976a1207 am: f6354a20d5 am: 9025d607a0
…
Merge "MediaCodecInfo: when explicitly specified reset default bitrate mode" am:
61c2096dbc am: 996fc3da05 am: 6e2b382afc
…
Merge "Update data type and comments on tagSocket/untagSocket APIs" am:
ef89731cd3 am: aa82affbc0 am: 292d5f01ec
…
…
…
…
Merge "Remove unused empty filegroups from frameworks/base." am:
5ee9c55130 am: 76e9b955c5 am: 735d0192f6
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%