f3bb0302a2e9b0262db6f2decd31ad74fdc98d28
4f319df8ff am: 49f031ea4d am: 2f74509789 am: c14e995495" into sc-v2-dev am: a18c3121d7 am: a5d599f7b6 -s ours
am skip reason: Merged-In Ie318d45fe44294e97cf38da7f1834cf014cb4417 with SHA-1 4f319df8ff is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780
Change-Id: I3440da84492a66ce18b9dce52340374a3effb5f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Add first set of libcore benchmarks to the System Health CB framework." am:
e01a01ca3e am: c7fda7b570 am: 5b96793af5
…
…
…
Merge "Add instructions on how to annotate an AIDL interface" am:
b6df9fb2e8 am: b691d9ce36 am: 9e7a44c173 am: 3ced8e8092
…
…
Merge "Update data type and comments on tagSocket/untagSocket APIs" am:
ef89731cd3 am: aa82affbc0 am: 292d5f01ec
Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into sc-v2-dev am:
196fc30c20
…
…
…
Merge "Disallow PAP authentication when MPPE is requested am:
4f319df8ff am: 49f031ea4d am: 2f74509789 am: c14e995495" into sc-v2-dev am: a18c3121d7
Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am:
08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: 4636aea564 am: d4e7e2336a
…
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%