tree a1e6c517d21b89f80ce68e99ecc3aaba20a2e4d0
parent 10f18d04ea12705fd7c719f0c503bad3b7aa87c7
parent 0eb99d23b4e0af2f8ead941b7f2c08e091688fc5
author Android Build Merger (Role) <android-build-merger@google.com> 1477084771 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1477084774 +0000

Merge "Merge "Camera2 Legacy: catch more surface abandoned error" am: 03f14bef41 am: 50f9b6e71f" into nyc-mr1-dev-plus-aosp