am 2e8a98e2: Merge "Manual frameworks/base merge from lockhotness (camera)."...
am 2e8a98e2: Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev
* commit '2e8a98e2':
Manual frameworks/base merge from lockhotness (camera).