tree 8f7a0d37e2cbf592d945b9b441eb006dbf899774
parent 5c533884ead3bb8a8e2e4e8d79587a81dbe31700
parent a97686096265c2b718e15f806bca352675e5cd2d
author Jim Miller <jaggies@google.com> 1352340554 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1352340554 -0800

Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev