7d70358a039426ca2da53cd3330638e2b12ca92e
bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo
Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into kraken * commit 'bde25c207731783a62e3611586fe05cd35add0d9': Fix 2737842: disable keyguard API when device policy is enabled.
Merge "Initial checkin of preliminary support for "http live" streaming in stagefright." into kraken
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%