tree 49abb3b1f562b2309b648d922219eee550972510
parent d37f4ea584512ffe681dbf3c6feabe293332a068
parent 3d83627b8a23dfe497f612a5f1d1e17caef3839e
author TreeHugger Robot <treehugger-gerrit@google.com> 1506030774 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1506030774 +0000

Merge changes I1dd7d8e6,I0a745eb0 into oc-mr1-dev

* changes:
  QCamera3: Make sure stream IDs are unique
  QCamera3: Protect unregisterBuffer