tree f56e67f0e9da47e7d782932da46f856e0804fef9
parent e4cd3b0d9529a1ef8d388ece83a101227e206cc3
parent 1e88e98d7d3bfe323bfbc551404d734cb69b2743
author Dianne Hackborn <hackbod@google.com> 1335317924 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1335317924 -0700

Merge "Fix issue #6373340: Cannot unlock to app if app was the..."