Merge "Don't store empty objects on SF traces"

author Nataniel Borges <natanieljr@google.com>

Wed, 27 Feb 2019 00:00:12 +0000 (00:00 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 27 Feb 2019 00:00:12 +0000 (00:00 +0000)
author Nataniel Borges <natanieljr@google.com>
Wed, 27 Feb 2019 00:00:12 +0000 (00:00 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 27 Feb 2019 00:00:12 +0000 (00:00 +0000)
diff --cc services/surfaceflinger/Layer.cpp
Simple merge
author	Nataniel Borges <natanieljr@google.com>
	Wed, 27 Feb 2019 00:00:12 +0000 (00:00 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 27 Feb 2019 00:00:12 +0000 (00:00 +0000)