tree 27854034e059d4710fc5e610e4d0eedb919eee5c
parent eb8182618941d7ff165a08f3b87b0151d0ba3251
parent b2690b67e097f71b0c059fa43acebb4c08e981f0
author Tom Taylor <tomtaylor@google.com> 1358451254 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358451254 -0800

am b2690b67: am 028b14bf: Merge "Revert "Add missing intent filter in AndroidManifest""

* commit 'b2690b67e097f71b0c059fa43acebb4c08e981f0':
  Revert "Add missing intent filter in AndroidManifest"