c228ce9b2ffbb0edff8c3bb2c6fe61aad0c6e5e5
31f1349d68
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15992488 Change-Id: I08b0a751f10eba0d6b9d705472555456a1cfdda0
Merge "Add a tool for merging annotation.zip files" am:
0e4260d772 am: b370ca080a am: 7ccd3666d6 am: 0d084d8990 am: 0ac02ae06e
…
…
…
…
…
…
…
…
Merge "media: use MediaProperties.resolution_limit_32bit()" am:
b721e9b48d am: 31d3ee2188 am: d2ec1478af am: 3bdacfd4b3 am: e6585e4af9
…
…
…
…
…
…
…
…
…
…
…
…
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%