am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener...

author Wink Saville <wink@google.com>

Tue, 13 Jan 2015 21:09:10 +0000 (21:09 +0000)

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

Tue, 13 Jan 2015 21:09:10 +0000 (21:09 +0000)
author Wink Saville <wink@google.com>
Tue, 13 Jan 2015 21:09:10 +0000 (21:09 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 13 Jan 2015 21:09:10 +0000 (21:09 +0000)
diff --cc api/current.txt
Simple merge
diff --cc packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
Simple merge
author	Wink Saville <wink@google.com>
	Tue, 13 Jan 2015 21:09:10 +0000 (21:09 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 13 Jan 2015 21:09:10 +0000 (21:09 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history