Merge "Change getFragments() to return a List." into oc-dev

author George Mount <mount@google.com>

Thu, 6 Apr 2017 00:22:01 +0000 (00:22 +0000)

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

Thu, 6 Apr 2017 00:22:01 +0000 (00:22 +0000)
author George Mount <mount@google.com>
Thu, 6 Apr 2017 00:22:01 +0000 (00:22 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 6 Apr 2017 00:22:01 +0000 (00:22 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	George Mount <mount@google.com>
	Thu, 6 Apr 2017 00:22:01 +0000 (00:22 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 6 Apr 2017 00:22:01 +0000 (00:22 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history