| commit | 3e4514ef03f7cfc4e2fb3f64e84a3d60af374ae4 | [log] [tgz] |
|---|---|---|
| author | Shuzhen Wang <shuzhenwang@google.com> | Wed May 11 21:23:20 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 11 21:23:20 2016 +0000 |
| tree | 0fd77f327f3ecdbdd9d577d55da33af2ea743943 | |
| parent | 682bac02c9a64514e96d8e44726f72bce1ea064e [diff] | |
| parent | 97bfadc41ffd9defba9da317f5670d185ff31591 [diff] |
Merge "QCamera2: HAL3: Fix a bad merge" into nyc-mr1-dev