OSDN Git Service

am c210a3f2: am edbfedf5: Merge "Splits out ACTION_MAIN intent filter for Settings...
authorAlexandra Gherghina <alexgherghina@google.com>
Mon, 15 Sep 2014 23:55:47 +0000 (23:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Sep 2014 23:55:47 +0000 (23:55 +0000)
* commit 'c210a3f2c645ead7dee4c76662dc0da14ffb0bc1':


Trivial merge