| commit | 31706c85b15f0e4f72cda2391aab7d6e3404de8c | [log] [tgz] |
|---|---|---|
| author | Jayant Chowdhary <jchowdhary@google.com> | Mon Oct 21 14:51:56 2019 -0700 |
| committer | Jayant Chowdhary <jchowdhary@google.com> | Mon Oct 21 16:46:51 2019 -0700 |
| tree | 67d4418891d6d5662cf080f0419a2d0149986862 | |
| parent | f94b6d6d8118e27213e38c0449159c60cbd74362 [diff] | |
| parent | fd39db81e44e191baa476a579de6cc2618de025a [diff] |
resolve merge conflicts of f7b975c56a98c3134adc5dc95834673eeee81f0d to qt-qpr1-dev-plus-aosp Test: build Test: Camera2 app take picture(sanity) Merged-In: I4a697c1eaccc3603007be4a595febea981fbeb64 Change-Id: I8562c83478b1fe8fbda7c85f97b995985666918d Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>