8a6a856f21f3a3ebf89dbac75c53ad187f2362bf
395e56a71c am: b7c5457ce8 -s ours am: 908d3fae61 -s ours am: d4755a8889 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15900956 Change-Id: Ic7b02458b8ad467bc1886de7f67ea9a755de7e1f
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%