tree 79289e47a452c88934c73c56ce934343d238c832
parent 80d27ad33c3722dc62732b842e5cf0b2dd0784dc
parent 69ac9887459a65a0eebc6f9c450a5b6c2313d713
author Jim Miller <jaggies@google.com> 1267160597 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1267160597 -0800

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