tree 6b485d294d7e9030b54ac652285a62f875288d4b
parent 644bdbcbcf6578825d50244e402a487d01112c5c
parent a0f9adaf25f1a1a75a32aa1f0843f44ea904c159
author Emilian Peev <epeev@google.com> 1542620955 -0800
committer android-build-merger <android-build-merger@google.com> 1542620955 -0800

Merge "Camera: Relax maximum Hal buffers and acquired count check" am: 6bff4d55bf
am: a0f9adaf25

Change-Id: I96b594a7ae6151425aa6c6429ec31ad8db516ba0