tree f9c6859b379718a953510613a09ba9e8beef55df
parent 61834a60bdd762f63b91cb1c8b4d74567a9e6983
parent 8b29ace33baec642a110acc3364de7fd545719ca
author Chien-Yu Chen <cychen@google.com> 1468963016 +0000
committer android-build-merger <android-build-merger@google.com> 1468963016 +0000

Merge \\"ImageReader: Make close thread safe\\" into nyc-mr1-dev am: 2f8bf1f024
am: 8b29ace33b

Change-Id: I94b195e2a7f43ed010ca3cebe933593c6960cfc6