d6d83279183db749de07bfdac79fe4180fc848d0
194bbcce: SIP: longer timeout for making call, shorter for cancelling
Merge commit '194bbcce9ba15634500f542b9ea017b2cf154b45' into gingerbread-plus-aosp * commit '194bbcce9ba15634500f542b9ea017b2cf154b45': SIP: longer timeout for making call, shorter for cancelling
am
6d8fae72: Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread
am
0b606263: Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread
am
524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread
am
37cedce1: Merge "Add an aapt option to allow string variations for different devices." into gingerbread
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%