Daniel Sandler 6a6d1b9444 am d5decdcc: Merge "Disable desk dock apps." into ics-mr1 ...

* commit 'd5decdccc64c59ad62de86c70dbe9ead12150cdc':
  Disable desk dock apps.

2011-11-16 22:35:29 -08:00

..

com/android/server

am d5decdcc: Merge "Disable desk dock apps." into ics-mr1

2011-11-16 22:35:29 -08:00

Android.mk

…