am a15ebaa2: am 79f5777d: Merge "A few odds and ends." into jb-dev

author Dianne Hackborn <hackbod@google.com>

Wed, 16 May 2012 01:20:45 +0000 (18:20 -0700)

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

Wed, 16 May 2012 01:20:45 +0000 (18:20 -0700)
author Dianne Hackborn <hackbod@google.com>
Wed, 16 May 2012 01:20:45 +0000 (18:20 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 16 May 2012 01:20:45 +0000 (18:20 -0700)
diff --cc api/16.txt
Simple merge
diff --cc api/current.txt
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Wed, 16 May 2012 01:20:45 +0000 (18:20 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 16 May 2012 01:20:45 +0000 (18:20 -0700)
		1	2
api/16.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history