tree fad68c50e8704adcfada76d0ebec7487bf709a5d
parent 4834fc778818e37a763b272ec154e855b0cbfef3
parent 34dc7945e541eb86267e090f7254552316526b4b
author Tom Taylor <tomtaylor@google.com> 1358216255 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358216255 -0800

am 34dc7945: am 137a1adc: Merge "Add missing intent filter in AndroidManifest"

* commit '34dc7945e541eb86267e090f7254552316526b4b':
  Add missing intent filter in AndroidManifest