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