am be86841c: am 28e00af9: am c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL...

author Wale Ogunwale <ogunwale@google.com>

Tue, 2 Jun 2015 21:26:41 +0000 (21:26 +0000)

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

Tue, 2 Jun 2015 21:26:41 +0000 (21:26 +0000)
author Wale Ogunwale <ogunwale@google.com>
Tue, 2 Jun 2015 21:26:41 +0000 (21:26 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 2 Jun 2015 21:26:41 +0000 (21:26 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Wale Ogunwale <ogunwale@google.com>
	Tue, 2 Jun 2015 21:26:41 +0000 (21:26 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 2 Jun 2015 21:26:41 +0000 (21:26 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history