tree 2ca23b2284d63c72a8b3997f694f94d3d7e69a9d
parent 515fd6b75318b094e392182496e870eab3445570
parent 5732386666aa2265d658e9fc861a1dfe22033861
author Chien-Yu Chen <cychen@google.com> 1439427787 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439427787 +0000

am 57323866: Merge "Camera3Device: Relax InFlightMap size check" into mnc-dev

* commit '5732386666aa2265d658e9fc861a1dfe22033861':
  Camera3Device: Relax InFlightMap size check