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