| commit | 012cfd9ffff557070aa796bbd346d1606a927abf | [log] [tgz] |
|---|---|---|
| author | Gabriel Nava <gnava@google.com> | Mon May 04 20:09:25 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon May 04 20:09:27 2015 +0000 |
| tree | 6576d13e088f93650a2c990084364a13f40a10a8 | |
| parent | 64f82d503cebad274deb8b5f7f7063135c99bba9 [diff] | |
| parent | 9a57f184a6f5be46e93dd2f6c66f4b9ba07bdd75 [diff] |
Merge "Avoid camera switch while HDR activation is in progress (camera-haleakala)" into ub-camera-haleakala