Merge "[API review] Add ShortcutInfo.DISABLED_REASON_UNKNOWN"

author TreeHugger Robot <treehugger-gerrit@google.com>

Wed, 10 Jan 2018 07:07:37 +0000 (07:07 +0000)

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

Wed, 10 Jan 2018 07:07:37 +0000 (07:07 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 10 Jan 2018 07:07:37 +0000 (07:07 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 10 Jan 2018 07:07:37 +0000 (07:07 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 10 Jan 2018 07:07:37 +0000 (07:07 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 10 Jan 2018 07:07:37 +0000 (07:07 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history