Merge "Expose APIs to analyze UIDs in UserHandle/Process." into nyc-dev

author Jeff Davidson <jpd@google.com>

Thu, 11 Feb 2016 00:52:01 +0000 (00:52 +0000)

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

Thu, 11 Feb 2016 00:52:02 +0000 (00:52 +0000)
author Jeff Davidson <jpd@google.com>
Thu, 11 Feb 2016 00:52:01 +0000 (00:52 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 11 Feb 2016 00:52:02 +0000 (00:52 +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	Jeff Davidson <jpd@google.com>
	Thu, 11 Feb 2016 00:52:01 +0000 (00:52 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 11 Feb 2016 00:52:02 +0000 (00:52 +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