Jim Miller aed22d27bb am a9a0a0b2: am 7d70358a: am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo

2010-06-08 10:15:21 -07:00

..

android

am a9a0a0b2: am 7d70358a: am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo

2010-06-08 10:15:21 -07:00

com

resolved conflicts for merge of f3307ae8 to master

2010-06-04 14:09:02 -07:00

jarjar-rules.txt

…

overview.html

…