Merge changes from topic "APIForQueryingHapticsExist"

author TreeHugger Robot <treehugger-gerrit@google.com>

Thu, 21 Mar 2019 23:33:25 +0000 (23:33 +0000)

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

Thu, 21 Mar 2019 23:33:25 +0000 (23:33 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 21 Mar 2019 23:33:25 +0000 (23:33 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 21 Mar 2019 23:33:25 +0000 (23:33 +0000)
diff --cc api/current.txt
Simple merge
diff --cc media/java/android/media/MediaFormat.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 21 Mar 2019 23:33:25 +0000 (23:33 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 21 Mar 2019 23:33:25 +0000 (23:33 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
media/java/android/media/MediaFormat.java	patch \|	diff1 \|	diff2 \|	blob \| history