| commit | 85d180292237d6a71a25d6881ff13a9d638721d8 | [log] [tgz] |
|---|---|---|
| author | Timothy Knight <tknight@google.com> | Wed Nov 26 08:12:35 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 26 08:12:35 2014 +0000 |
| tree | de39facd3554fbe604b5b7d76b07fcc282e61b0b | |
| parent | 0e8db972cae12fdc0c43740af02a5e925f015e92 [diff] | |
| parent | 4c8e07758510e7b2fbda868b60392d44356ed864 [diff] |
Merge "CameraITS: Fix for bad merge, in a merge conflct resolution earslier today" into lmp-mr1-dev