Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev

author Cedric Ho <cedricho@google.com>

Wed, 27 May 2015 17:46:40 +0000 (17:46 +0000)

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

Wed, 27 May 2015 17:46:41 +0000 (17:46 +0000)
author Cedric Ho <cedricho@google.com>
Wed, 27 May 2015 17:46:40 +0000 (17:46 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 27 May 2015 17:46:41 +0000 (17:46 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Cedric Ho <cedricho@google.com>
	Wed, 27 May 2015 17:46:40 +0000 (17:46 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 27 May 2015 17:46:41 +0000 (17:46 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history