Jim Miller c19dade5a4 am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo ...

Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into froyo-plus-aosp

* commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
  Fix 2737842: Disable KeguardManager API if device policy is enabled

2010-06-08 16:33:22 -07:00

..

config

…

java

am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo

2010-06-08 16:33:22 -07:00

jni

Watchdog now records kernel stacks when it fires

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

res

am f9610b38: Merge "Make the DUN apn data secure." into froyo

2010-06-04 15:57:21 -07:00

tests

merge from open-source master

2010-06-03 09:03:58 -07:00