From: Alexandra Gherghina <alexgherghina@google.com>
Date: Mon, 8 Sep 2014 19:21:39 +0000 (+0000)
Subject: am edbfedf5: Merge "Splits out ACTION_MAIN intent filter for Settings and doesn\... 
X-Git-Tag: android-x86-6.0-r1~671^2~660^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=572290d68b8a9c05b8337b7e1975534f8192e428;p=android-x86%2Fpackages-apps-Settings.git

am edbfedf5: Merge "Splits out ACTION_MAIN intent filter for Settings and doesn\'t forward it." into lmp-dev

* commit 'edbfedf58fe2cb636017cc6d16da654525a4362f':
  Splits out ACTION_MAIN intent filter for Settings and doesn't forward it.
---

572290d68b8a9c05b8337b7e1975534f8192e428