tree 179f7bbca4d4e9adbd0be353e3fd164a33b7dcbc
parent c7e6b93aba9dce93aacb05b5d9f59d09eddb0329
parent 58fd96c607de7f7f821a0b15fd37bc28323fcfde
author Miao Wang <miaowang@google.com> 1423096069 +0000
committer android-build-merger <android-build-merger@google.com> 1423096069 +0000

Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" automerge: 9a55cbc
automerge: 58fd96c

* commit '58fd96c607de7f7f821a0b15fd37bc28323fcfde':
  make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)