| commit | 4c75e64d29f7bf088acd2edd3eec22955bd6f0d5 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Oct 23 02:20:02 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 23 02:20:02 2015 +0000 |
| tree | 09bc4f5bcd8a8ba6b8bb2ad375616416a225a8a7 | |
| parent | d567535d39f7c961e2cb7580d135066dbce37986 [diff] | |
| parent | 3b51079095ee645239d61de306fbb45c0a896f7d [diff] |
Merge "resolve merge conflicts of 49daa6e6db to mnc-dev." into mnc-dev am: 3b51079095 * commit '3b51079095ee645239d61de306fbb45c0a896f7d': CameraITS: use linear tonemap in test_exposure