tree 3cc80ad0b7a78983dacc940114fa0bbdbc303a90
parent c31f5af0b94090835e88a8a7bdde31782133a6d8
parent e2c1d423321aa75bdccc62b3d1cc8d820a2d94a4
author James Dong <jdong@google.com> 1274383119 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1274383119 -0700

Merge "Workaround for preview frame rate setting and encoder profile and level settings on passion 1. QCOM camera HAL does not honor the preview frame rate set request. see bug - 2701282 2. QCOM video encoder has lots of 0-length output buffers if the default level setting is changed. see bug - 2660974" into kraken