tree 5bf992a43ce764bfdd673751f129eae3d7fa233d
parent a9e752f401a7c0405ca4312f0d3dd277e9bb6d32
parent 95171050e9877deb9b1f84b4c55aa828229e2809
author Eino-Ville Talvala <etalvala@google.com> 1457720293 +0000
committer android-build-merger <android-build-merger@google.com> 1457720293 +0000

Merge "Camera2: Add buffer drop error callback" into nyc-dev
am: 95171050e9

* commit '95171050e9877deb9b1f84b4c55aa828229e2809':
  Camera2: Add buffer drop error callback