Merge "API council suggested edits, part 3" am: 7a4cc05d45 am: 4c4fb3bdfb

author Hall Liu <hallliu@google.com>

Fri, 15 Sep 2017 03:26:50 +0000 (03:26 +0000)

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

Fri, 15 Sep 2017 03:26:50 +0000 (03:26 +0000)
author Hall Liu <hallliu@google.com>
Fri, 15 Sep 2017 03:26:50 +0000 (03:26 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 15 Sep 2017 03:26:50 +0000 (03:26 +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	Hall Liu <hallliu@google.com>
	Fri, 15 Sep 2017 03:26:50 +0000 (03:26 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 15 Sep 2017 03:26:50 +0000 (03:26 +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