diff options
| author | Jim Miller <jaggies@google.com> | 2010-06-08 16:33:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-08 16:33:22 -0700 |
| commit | c19dade5a4cd1a9e1154c4fb20ac6d509f1d0bd5 (patch) | |
| tree | e488751bf7724f4cd4ba40613b01d49100df0ca1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4bd6940c576a1bbf47e52607e7c06a1cb7a476dc (diff) | |
| parent | 75b6a6b972e6b18143fd629d3d9c824c442c5f4c (diff) | |
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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions