tree 0793d7d67289a88769ee60770b8558110e75004b
parent d0aebd900913a6308398f088e32b83fb9f3bb700
parent a10b1a738dfa8fcf094fec555e7d85dba179f5fc
author Jim Miller <jaggies@google.com> 1340051699 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340051699 -0700

am a10b1a73: am 12da2c5e: Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev

* commit 'a10b1a738dfa8fcf094fec555e7d85dba179f5fc':
  Fix 6665117: ACTION_ASSIST visual improvements