am bedf4b8b: am 5f5d0544: Merge "Camera1 shim: If there\'s no flash, the keys...
am bedf4b8b: am 5f5d0544: Merge "Camera1 shim: If there\'s no flash, the keys need to be null." into lmp-dev
* commit 'bedf4b8b':
Camera1 shim: If there's no flash, the keys need to be null.