tree 136d3bb611880422e32edd583857b8c58204673b
parent 648ac0f2873286a6feab35caccb550283b128491
parent 3261cc5d8e56026c1fea90267ed4eac715b4acb2
author Jim Miller <jaggies@google.com> 1267160759 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1267160759 -0800

Merge "Fix 2336057: Provide a way for the user to return to a call from LockScreen."