| commit | edea332aa8a58edf4af635a2da31585f45998366 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Sun Mar 30 00:47:57 2014 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Sun Mar 30 00:47:57 2014 -0700 |
| tree | 0cca31a35a510593d3a5f6c23e7d8d1dc1658e6d | |
| parent | 8bb2b9499756af5348e538b7cc70c1e346e94cc6 [diff] | |
| parent | cd117f438369f09c258926f3345fdc0f007762d7 [diff] |
Merge "Camera2: Disable some conflict items when HDR on"