tree 416a0e47c0df0ae9f914b20f8b14bc93145277c6
parent d18971811fb8c54c55bf59f34662650101a3eff0
parent dfe920d3bb3a1b896d3b16d1b58bd7d56fc2e70d
author Chien-Yu Chen <cychen@google.com> 1460763873 +0000
committer android-build-merger <android-build-merger@google.com> 1460763873 +0000

Merge "Camera2: Stop repeating request for abandoned output" into nyc-dev
am: dfe920d

* commit 'dfe920d3bb3a1b896d3b16d1b58bd7d56fc2e70d':
  Camera2: Stop repeating request for abandoned output

Change-Id: I9c5e31e5476e860d7b1ac974d62ae6fb5646069a