Merge "Camera: Update "RecommendedStreamConfigurationMap" annotations"

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

Mon, 18 Mar 2019 23:42:53 +0000 (23:42 +0000)

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

Mon, 18 Mar 2019 23:42:53 +0000 (23:42 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Mon, 18 Mar 2019 23:42:53 +0000 (23:42 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 18 Mar 2019 23:42:53 +0000 (23:42 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/hardware/camera2/params/RecommendedStreamConfigurationMap.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Mon, 18 Mar 2019 23:42:53 +0000 (23:42 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 18 Mar 2019 23:42:53 +0000 (23:42 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/hardware/camera2/params/RecommendedStreamConfigurationMap.java	patch \|	diff1 \|	diff2 \|	blob \| history