Merge "Recording activity notification: return list of configuration" into nyc-dev

author Jean-Michel Trivi <jmtrivi@google.com>

Mon, 23 May 2016 20:49:28 +0000 (20:49 +0000)

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

Mon, 23 May 2016 20:49:30 +0000 (20:49 +0000)
author Jean-Michel Trivi <jmtrivi@google.com>
Mon, 23 May 2016 20:49:28 +0000 (20:49 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 23 May 2016 20:49:30 +0000 (20:49 +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	Jean-Michel Trivi <jmtrivi@google.com>
	Mon, 23 May 2016 20:49:28 +0000 (20:49 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 23 May 2016 20:49:30 +0000 (20:49 +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