tree cce6515470e3802fc361d4ecc6e2055619761f87
parent 359b2bccd9b96348d4bad949b000c8310ffe9386
parent ae3311e5bd7b146eb4e1bc6310cbaba051776fb4
author Michael Chan <mchan@android.com> 1264032404 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1264032404 -0800

Merge "b/2370089 Pop the dock dialog above the keyguard" into eclair