Merge "Add API to get a uid's current importance." into oc-dev am: ad6ab44e15

author Dianne Hackborn <hackbod@google.com>

Wed, 12 Apr 2017 22:21:30 +0000 (22:21 +0000)

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

Wed, 12 Apr 2017 22:21:30 +0000 (22:21 +0000)
author Dianne Hackborn <hackbod@google.com>
Wed, 12 Apr 2017 22:21:30 +0000 (22:21 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 22:21:30 +0000 (22:21 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Wed, 12 Apr 2017 22:21:30 +0000 (22:21 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 12 Apr 2017 22:21:30 +0000 (22:21 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history