tree 87ed8ace81a65f1e9a98907b9598bd00ed4d431f
parent 9b9e8c6f4f38a91d56facc9e0fcc55e59f64d2ef
parent 2424d28b42edd66e6806244cddf2a5eb8675f652
author Marco Nelissen <marcone@google.com> 1438997816 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438997816 +0000

am 2424d28b: am c40ef744: am af3c0475: am 9c67741f: am 2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev

* commit '2424d28b42edd66e6806244cddf2a5eb8675f652':
  Extra sanity checks on sample size and resolution