Merge commit '7fca18d4eadd3da0e616f2663aca41be4a01ec2f' into kraken * commit '7fca18d4eadd3da0e616f2663aca41be4a01ec2f': Fix aapt to build in Windows SDK under Linux
am bd17156f: am 85a8dcec: Merge "Only honor the scrollbar mode at the minimum zoom level. This reduced the impact of https://android-git.corp.google.com/g/#change,48683. In GB, we need to revisit this issue." into froyo
am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo
Description
No description provided
Languages
Java
77.3%
Kotlin
9.2%
PowerBuilder
6.6%
C++
5.5%
AIDL
1%