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

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

Mon, 23 May 2016 21:06:33 +0000 (21:06 +0000)

committer android-build-merger <android-build-merger@google.com>

Mon, 23 May 2016 21:06:33 +0000 (21:06 +0000)
author Jean-Michel Trivi <jmtrivi@google.com>
Mon, 23 May 2016 21:06:33 +0000 (21:06 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 23 May 2016 21:06:33 +0000 (21:06 +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 21:06:33 +0000 (21:06 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 23 May 2016 21:06:33 +0000 (21:06 +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