276bb3a32794097918671780ea9d39aea522aa41
843ff92b: resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp
Merge commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342' * commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342': Make disabled TextViews uneditable
…
am
b619e333: am 218bf884: am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image
am
add9db83: am f4cd9be0: Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread
…
am
ec62719c: am 004f968d: Merge "Link against the static libcrypto in external/openssl." into gingerbread
am
bdc15d8b: am 4056ab97: Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread
…
am
38476ef2: am 8f1e7b62: Merge "Cleanspec to fix incremental build failures of the form:" into gingerbread
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%