Merge "Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev am: 22faa5ddb...

author Android Build Merger (Role) <android-build-merger@google.com>

Tue, 21 Jun 2016 23:36:59 +0000 (23:36 +0000)

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

Tue, 21 Jun 2016 23:37:00 +0000 (23:37 +0000)
author Android Build Merger (Role) <android-build-merger@google.com>
Tue, 21 Jun 2016 23:36:59 +0000 (23:36 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 21 Jun 2016 23:37:00 +0000 (23:37 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Android Build Merger (Role) <android-build-merger@google.com>
	Tue, 21 Jun 2016 23:36:59 +0000 (23:36 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 21 Jun 2016 23:37:00 +0000 (23:37 +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