tree a1e6c517d21b89f80ce68e99ecc3aaba20a2e4d0
parent ccf3baf6c5ee78dd19290591408025e116c5c97e
parent 50f9b6e71f8b91848278aae896feb2902f2c19a1
author Yin-Chia Yeh <yinchiayeh@google.com> 1477084728 +0000
committer android-build-merger <android-build-merger@google.com> 1477084728 +0000

Merge "Camera2 Legacy: catch more surface abandoned error" am: 03f14bef41
am: 50f9b6e71f

Change-Id: I1da99a15ab8ff08d3f9ccb0e9408990ad60ff279