Merge "Add fingerprint navigation to enable pulling down the statusbar" into nyc...

author Jim Miller <jaggies@google.com>

Wed, 18 May 2016 02:55:08 +0000 (02:55 +0000)

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

Wed, 18 May 2016 02:55:10 +0000 (02:55 +0000)
author Jim Miller <jaggies@google.com>
Wed, 18 May 2016 02:55:08 +0000 (02:55 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 18 May 2016 02:55:10 +0000 (02:55 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/res/res/values/attrs.xml
Simple merge
author	Jim Miller <jaggies@google.com>
	Wed, 18 May 2016 02:55:08 +0000 (02:55 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 18 May 2016 02:55:10 +0000 (02:55 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/attrs.xml	patch \|	diff1 \|	diff2 \|	blob \| history