commit | 8dc1180d5db836fc794d6dcd884aa13a94470516 | [log] [tgz] |
---|---|---|
author | Jayant Chowdhary <jchowdhary@google.com> | Mon Oct 28 13:39:05 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Oct 28 13:39:05 2019 -0700 |
tree | c017b82b24083910b26ea205e4960d76fdbe8494 | |
parent | 065766d07212d8ed517780488c919d406f0d1db4 [diff] | |
parent | 40ffd15a79cb53eb917d00c84beb16dde956ab04 [diff] |
[automerger skipped] Merge "cameraserver: Avoiding deadlocks while calling isPublicallyHiddenSecureCamera()." into qt-qpr1-dev am: 6112a9c691 am: 40ffd15a79 -s ours am skip reason: change_id I8562c83478b1fe8fbda7c85f97b995985666918d with SHA1 31706c85b1 is in history Change-Id: I56d5820bb5366b65e13b0808451095448186e00a