commit | aa06a7751917bd694f475dc8110c8150c4e4ad72 | [log] [tgz] |
---|---|---|
author | Steve Pfetsch <spfetsch@google.com> | Tue May 17 01:48:11 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 17 01:48:11 2016 +0000 |
tree | 8de619d7474fdec8082c2be6c483b272d665660a | |
parent | 6d897454a54554f0d2a07b14e296b27dd2dedea8 [diff] | |
parent | c8c0af529045368f33aea08ead0bc4a8e9c41c98 [diff] |
Merge changes from topic 'marlin_merge_AU171' into nyc-mr1-dev * changes: camera: Update to AU171 proprietary drop Revert "QCamera2/HAL3: Add more resolutions to HIGH_SPEED_VIDEO list"