commit | 9b2a5b15af79edf86a81c9d041ab8ec723501df2 | [log] [tgz] |
---|---|---|
author | Cyan_Hsieh <cyanhsieh@google.com> | Wed Mar 13 18:16:41 2019 +0800 |
committer | Cyan_Hsieh <cyanhsieh@google.com> | Fri Mar 15 20:53:35 2019 +0800 |
tree | 3216b63fb387cf942fa1227680a1c9eabeb063f3 | |
parent | 084883f474c4957d04cea9f1395ff874f4d0c79a [diff] | |
parent | 59e0f0ab3ba628e69aed6523ddc8b0479c7c1fdb [diff] |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.081' Conflicts: mm-video-v4l2/vidc/common/Android.mk Bug: 127924739 Change-Id: I14cac21c823feb61b413276f4ec61d9a89bc55a5