tree 28da6e48aa338d164249ccec18ad1a344c36deea
parent 9a5a8aafad89f3e05bb9c17c56ea4658413a4452
parent cab997b2020ddb67158397dccadd28d91a7710d0
author Jim Miller <jaggies@google.com> 1340144685 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340144685 -0700

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

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