am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO...

author Mathias Agopian <mathias@google.com>

Wed, 15 Jun 2011 21:13:04 +0000 (14:13 -0700)

committer Android Git Automerger <android-git-automerger@android.com>

Wed, 15 Jun 2011 21:13:04 +0000 (14:13 -0700)
author Mathias Agopian <mathias@google.com>
Wed, 15 Jun 2011 21:13:04 +0000 (14:13 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 15 Jun 2011 21:13:04 +0000 (14:13 -0700)
diff --cc libs/utils/RefBase.cpp
Simple merge
diff --cc services/surfaceflinger/Layer.cpp
Simple merge
author	Mathias Agopian <mathias@google.com>
	Wed, 15 Jun 2011 21:13:04 +0000 (14:13 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 15 Jun 2011 21:13:04 +0000 (14:13 -0700)
		1	2
libs/utils/RefBase.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/Layer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history