tree 9c9646da6027c591bb706d9c4347ee4c2e288f2c
parent dec527afe76c224381187711934441460de028cc
parent 0226d021ae31fef7e571396f2fe34a7814cb0889
author Andrew Boren <andrew.boren@gmail.com> 1369629926 -0700
committer Gerrit Code Review <evervolv.gerrit2@p000000.pubip.peer1.net> 1369629926 -0700

Merge "camera: fixup htc params" into jellybean