Merge "Add pending system update info system APIs."

author TreeHugger Robot <treehugger-gerrit@google.com>

Mon, 22 Jan 2018 20:12:43 +0000 (20:12 +0000)

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

Mon, 22 Jan 2018 20:12:43 +0000 (20:12 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Mon, 22 Jan 2018 20:12:43 +0000 (20:12 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 22 Jan 2018 20:12:43 +0000 (20:12 +0000)
diff --cc Android.bp
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/app/SystemServiceRegistry.java
Simple merge
diff --cc core/java/android/content/Context.java
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc services/java/com/android/server/SystemServer.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Mon, 22 Jan 2018 20:12:43 +0000 (20:12 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 22 Jan 2018 20:12:43 +0000 (20:12 +0000)
		1	2
Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/SystemServiceRegistry.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/content/Context.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/java/com/android/server/SystemServer.java	patch \|	diff1 \|	diff2 \|	blob \| history