tree a268b063006430a272e1e91c76cc38adf342669a
parent d96f8837c9e1782e0309828b316cca5262719633
parent cfb81966d1ff5b7bdbb014d73e7946976efc0b8b
author Ivan Podogov <ginkage@google.com> 1474629025 +0000
committer android-build-merger <android-build-merger@google.com> 1474629025 +0000

Merge "Don't try to connect camera service if it is disabled." into cw-f-dev
am: cfb81966d1

Change-Id: I8cd1dd7bb97186379f02f906f0d64133fd3defef