Commits
John Spurlock authored and Android Git Automerger committed 9e1f1a8e844M
am 8a109dba: am 8c480e4b: am 86b6357e: Manual f/b merge of lockhotness camera integration. * commit '8a109dba86857853b3351b3a7f41150629b494ad': Manual f/b merge of lockhotness camera integration.
Showing diff to8a109dba868