tree 39edeec23530a5b8b4b6d09aa42cd647f27de918
parent 261be854cf49b978d5591d669e9d7943749c6028
parent 092cedda098d1f41e59fb0b48d6aad7e14426b61
author Yin-Chia Yeh <yinchiayeh@google.com> 1512419738 +0000
committer android-build-merger <android-build-merger@google.com> 1512419738 +0000

Merge "Camera: fix dump/disconnect race" am: bc5a836479 am: 8b6831cf7b
am: 092cedda09

Change-Id: I24885f663939fa6aa5dfd550837e350c846798cb