commit | c61f921b99488ae4b855a50c3fc291c547cc0257 | [log] [tgz] |
---|---|---|
author | Ruben Brunk <rubenbrunk@google.com> | Fri Feb 13 01:45:27 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 13 01:45:27 2015 +0000 |
tree | 556a24fbb603f747feef32a4d3e4fe4641f40c64 | |
parent | cdd9fd76de73e8e87706eb99bd5bde916a372351 [diff] | |
parent | ff475c0ea71ffd5f015cce1462daf373129ca896 [diff] |
am ff475c0e: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4 automerge: 41af9d5 * commit 'ff475c0ea71ffd5f015cce1462daf373129ca896': camera2: Fix legacy scaling factor application.