tree 3e6c03c657b8f7028f9af572563ed74553168477
parent 127d4deab1606527777160d4ace3b92baae8b67f
parent ec5501acd8d3e2762f751ab48d7ccc25ce0b11b8
author Steven Ross <stross@google.com> 1332290346 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332290346 -0700

Merge "Adding lock icon to FaceLockAreaView on lockscreen fixes 5394522"