Merge "Add SystemApis to expose runtime profile information"

author Calin Juravle <calin@google.com>

Tue, 5 Dec 2017 19:10:34 +0000 (19:10 +0000)

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

Tue, 5 Dec 2017 19:10:34 +0000 (19:10 +0000)
author Calin Juravle <calin@google.com>
Tue, 5 Dec 2017 19:10:34 +0000 (19:10 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 5 Dec 2017 19:10:34 +0000 (19:10 +0000)
diff --cc Android.bp
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Calin Juravle <calin@google.com>
	Tue, 5 Dec 2017 19:10:34 +0000 (19:10 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 5 Dec 2017 19:10:34 +0000 (19:10 +0000)
		1	2
Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history