| commit | 75b6a6b972e6b18143fd629d3d9c824c442c5f4c | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Jun 08 16:31:32 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 08 16:31:32 2010 -0700 |
| tree | 63e0e3fde1d253ed1cf8a09d14908c8130b663d0 | |
| parent | 71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5 [diff] | |
| parent | 284b62e1b8c3419bfd02c6fea5ba0a68146c06f8 [diff] |
Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo