Jim Miller ce01bd6e76 am ee499fe6: Merge "Fix 6504124: Disable assist when ACTION_ASSIST is not available" into jb-dev ...

* commit 'ee499fe68e7ea61741779f375056dbaf5a78d1d7':
  Fix 6504124: Disable assist when ACTION_ASSIST is not available

2012-05-16 16:39:03 -07:00

..

src/com/android/internal/policy/impl

am ee499fe6: Merge "Fix 6504124: Disable assist when ACTION_ASSIST is not available" into jb-dev

2012-05-16 16:39:03 -07:00

tests

Fix 6028595: Fix reboot loop in AccountUnlock due to null callback

2012-03-01 16:15:27 -08:00

Android.mk

…