Commits
John Spurlock authored and Android Git Automerger committed eb4c0cb5098M
am 2e8a98e2: Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev * commit '2e8a98e269486700d985f842806ce70e3a394dc9': Manual frameworks/base merge from lockhotness (camera).
Showing diff tof78367e2d2d