Merge "MediaCas: add framework APIs"

author Chong Zhang <chz@google.com>

Thu, 23 Feb 2017 22:36:18 +0000 (22:36 +0000)

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

Thu, 23 Feb 2017 22:36:22 +0000 (22:36 +0000)
author Chong Zhang <chz@google.com>
Thu, 23 Feb 2017 22:36:18 +0000 (22:36 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 23 Feb 2017 22:36:22 +0000 (22:36 +0000)
diff --cc Android.mk
Simple merge
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Chong Zhang <chz@google.com>
	Thu, 23 Feb 2017 22:36:18 +0000 (22:36 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 23 Feb 2017 22:36:22 +0000 (22:36 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
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