tree 39a137f834ace19bfe3f2e865c3ee255ddafb51d
parent ff97e6e8412d9985938e715fcd1030adba328d4b
parent 61413b5ed215accd7b4f3eaf80edeab2f330aa49
author Danielle Millett <dmillett@google.com> 1349982457 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349982458 -0700

Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev