OSDN Git Service

Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into...
authorJim Miller <jaggies@google.com>
Tue, 8 Jun 2010 23:31:32 +0000 (16:31 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 8 Jun 2010 23:31:32 +0000 (16:31 -0700)
commit75b6a6b972e6b18143fd629d3d9c824c442c5f4c
tree63e0e3fde1d253ed1cf8a09d14908c8130b663d0
parent71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5
parent284b62e1b8c3419bfd02c6fea5ba0a68146c06f8
Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo