From: Tony Mak <tonymak@google.com>
Date: Thu, 5 May 2016 13:57:03 +0000 (+0000)
Subject: Merge "Should forward the intent even if its activity is disabled in Settings" into... 
X-Git-Tag: android-x86-7.1-r1~802
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ce2201a04c824fa8cc0376e786f511a2067b0a77;p=android-x86%2Fpackages-apps-Settings.git

Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev
am: de4b51c8ce

* commit 'de4b51c8ce4d16ef086ad04532113a942b267f1a':
  Should forward the intent even if its activity is disabled in Settings

Change-Id: I3f2c1ce85fc96f299b931a99036f72e1e2478bd8
---

ce2201a04c824fa8cc0376e786f511a2067b0a77