tree 304742b85ca8c1f6aa537c388af0781dfd934801
parent 1ac4db1cbe8ce9da74a54cad95879499d536ffb4
parent 4aa219984d1b634a490ef3fe8ae6e16a4ef48d3b
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1512419760 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1512419760 +0000

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