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)
commit572290d68b8a9c05b8337b7e1975534f8192e428
tree06104b46ca671c218a079305b70e7eaa0e7c34a7
parent70a2b5d93bc75a115f8c2f4fd847ef8b3a9bbe42
parentedbfedf58fe2cb636017cc6d16da654525a4362f
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.