Merge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo...

author Dianne Hackborn <hackbod@google.com>

Fri, 31 Mar 2017 23:44:42 +0000 (23:44 +0000)

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

Fri, 31 Mar 2017 23:44:42 +0000 (23:44 +0000)
author Dianne Hackborn <hackbod@google.com>
Fri, 31 Mar 2017 23:44:42 +0000 (23:44 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 31 Mar 2017 23:44:42 +0000 (23:44 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/app/ContextImpl.java
Simple merge
diff --cc tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Fri, 31 Mar 2017 23:44:42 +0000 (23:44 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 31 Mar 2017 23:44:42 +0000 (23:44 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/ContextImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java	patch \|	diff1 \|	diff2 \|	blob \| history