Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"

author Glenn Kasten <gkasten@google.com>

Thu, 5 Jan 2012 15:38:29 +0000 (07:38 -0800)

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

Thu, 5 Jan 2012 15:38:29 +0000 (07:38 -0800)
author Glenn Kasten <gkasten@google.com>
Thu, 5 Jan 2012 15:38:29 +0000 (07:38 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 5 Jan 2012 15:38:29 +0000 (07:38 -0800)
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
author	Glenn Kasten <gkasten@google.com>
	Thu, 5 Jan 2012 15:38:29 +0000 (07:38 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 5 Jan 2012 15:38:29 +0000 (07:38 -0800)