Merge "Discourage use of "_data" column."

author Jeff Sharkey <jsharkey@google.com>

Wed, 6 Jan 2016 17:26:25 +0000 (17:26 +0000)

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

Wed, 6 Jan 2016 17:26:25 +0000 (17:26 +0000)
author Jeff Sharkey <jsharkey@google.com>
Wed, 6 Jan 2016 17:26:25 +0000 (17:26 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 6 Jan 2016 17:26:25 +0000 (17: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	Jeff Sharkey <jsharkey@google.com>
	Wed, 6 Jan 2016 17:26:25 +0000 (17:26 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 6 Jan 2016 17:26:25 +0000 (17: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