diff options
| author | Treehugger Robot <android-build-prod@system.gserviceaccount.com> | 2020-10-07 20:16:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-07 20:16:56 +0000 |
| commit | a968f8a65c79d701b2123bbd6a2c4c99b7958692 (patch) | |
| tree | 8d14911174130051c8846fbf809f51d4345e6580 /camera/common/1.0/default/CameraModule.cpp | |
| parent | 1937cd45e5faaabc91dbf8610c35cb21002220ef (diff) | |
| parent | 1daa24bcf2aaa5b368b9bf71a26f67cb04594ced (diff) | |
Merge changes from topic "am-981bbba8-b263-43b8-8a49-8ff3844ffbef" into s-keystone-qcom-dev
* changes:
[automerger skipped] Enable logs during hal stop and increase timeout to 500 ms skipped: 179321a381
Enable logs during hal stop and increase timeout to 500 ms
Diffstat (limited to 'camera/common/1.0/default/CameraModule.cpp')
0 files changed, 0 insertions, 0 deletions