Merge "API Council Change Phase 2 - add/remove callback" into mnc-dev

author Paul McLean <pmclean@google.com>

Wed, 13 May 2015 16:18:59 +0000 (16:18 +0000)

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

Wed, 13 May 2015 16:19:00 +0000 (16:19 +0000)
author Paul McLean <pmclean@google.com>
Wed, 13 May 2015 16:18:59 +0000 (16:18 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 13 May 2015 16:19:00 +0000 (16:19 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Paul McLean <pmclean@google.com>
	Wed, 13 May 2015 16:18:59 +0000 (16:18 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 13 May 2015 16:19:00 +0000 (16:19 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history