OSDN Git Service

am edbfedf5: Merge "Splits out ACTION_MAIN intent filter for Settings and doesn\...
authorAlexandra Gherghina <alexgherghina@google.com>
Mon, 8 Sep 2014 19:21:39 +0000 (19:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Sep 2014 19:21:39 +0000 (19:21 +0000)
* commit 'edbfedf58fe2cb636017cc6d16da654525a4362f':
  Splits out ACTION_MAIN intent filter for Settings and doesn't forward it.


Trivial merge