1f4bb6033527ca3ebae51df004cce29f2bb4534f
1e5ed56a17 am: f6299b30db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607969 Change-Id: Ifa45eea3a0212371cad66dbe3076e7f25e4566de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Update LockSettingsCmd's showUsage method to defer to calling "locksettings help"." into tm-dev am:
a2d50b2bbf am: a3f8fa9123
Merge "Inform the remote provisioner when a key may have been consumed" am:
ca344c9949 am: dc13e716c4 am: d085caf2b3 am: d4530a83ef
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "Update data type and comments on tagSocket/untagSocket APIs" am:
ef89731cd3 am: aa82affbc0 am: 292d5f01ec am: 72d6df3c6f
Merge "Migrate rs/jni to Soong" am:
eaebd2cd54 am: a6f5cf56e8 am: 21587435c7 am: 22b41229f1 am: 87bbc3ef20
Merge "Skip window exit animation if display has transition" into tm-dev am:
61f01fe56b am: 1bc88e105d
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 "Change aapt2 to specify full protos" am:
6787226865 am: 3da3dce716 am: ccd8e91bf1 am: 2f58e1c38c am: cd5c905a00
…
Merge "Remove unused empty filegroups from frameworks/base." am:
5ee9c55130 am: 76e9b955c5 am: 735d0192f6
…
Merge "Move hiddenapi sort preupload tools to tools/platform-compat" am:
b82853357b am: 89aedd6cb8 am: af77c134d9
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%