476cacb0112e5ace18e698df74598a4157be44e3
This is an internal fix to avoid merge conflict for AOSP change. The developer change is aosp/1607953 Bug: 185728458 Test: manual Change-Id: Ic16ed5e4ac507f02e56f9e9cd94d4b4cfb028d69
Merge "Move global hidden API flags generation to platform_bootclasspath" am:
f277259089 am: 72b1ff135f am: 78f9593ff7
Merge "Avoid duplication of compat team email addresses in OWNERS" am:
2435cbfde7 am: 9a4f3c85be am: 6ef49b92d1
Merge "Remove unnecessary entries in frameworks/base/config/OWNERS" am:
a2baa71441 am: e9ec371853 am: a8329471e4
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "Keystore 2.0 SPI: Make getAttestationIds return an empty array." am:
1f82f476c0 am: cf64e636a8 am: 1a4f20ceac
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
…
…
…
Merge "Add auto-postsubmit test tag for frameworks/base" am:
ec14bafb25 am: 987d246395 am: c8cf0becf0
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%