tree b70fe1e1d7b3aeb82542f00e1d4d2224c8a33d15
parent 36d3f3fd02163e836ffea6a335ebe78a110fcd9c
parent eafe737ac31c9dcc5b0f42884b4d27c568e255c0
author TreeHugger Robot <treehugger-gerrit@google.com> 1502995084 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502995084 +0000

Merge "Don't call surface.remove if surface is null." into oc-mr1-dev