summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-07-12 19:06:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-12 19:06:24 -0700
commit281d8f991e9fc850bdb664cb63489d4cbef4f1ae (patch)
tree45db30090f906e068a520044e7b3bbad9c45da49
parent8728c6a5485c611f7af72b1ffb6eb6b14821846d (diff)
parent85001bc578825652f521a4b7451f382a5e80e9f1 (diff)
downloadframeworks_native-281d8f991e9fc850bdb664cb63489d4cbef4f1ae.zip
frameworks_native-281d8f991e9fc850bdb664cb63489d4cbef4f1ae.tar.gz
frameworks_native-281d8f991e9fc850bdb664cb63489d4cbef4f1ae.tar.bz2
am 1bcb6658: Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo
Merge commit '1bcb665825dc97789e8c1b892ec4298fd0b8c552' into gingerbread * commit '1bcb665825dc97789e8c1b892ec4298fd0b8c552': Fix issue #2834005: Android Settings.Secure bypass
0 files changed, 0 insertions, 0 deletions