tree b6f52f85dc7ff206e532030f16dfed0a04387cbb
parent 2fa2a52838619d092e22e61e16a4ee2f35b22fdd
parent 2b7df3686f24a5a653a6609556dd98210324f7bd
author Jim Miller <jaggies@google.com> 1340144814 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340144814 -0700

am 2b7df368: am cab997b2: Merge "Fix 6667238: allow market apps to support ACTION_ASSIST" into jb-dev

* commit '2b7df3686f24a5a653a6609556dd98210324f7bd':
  Fix 6667238: allow market apps to support ACTION_ASSIST