tree 67a1ed3ffdf7726eb13bf18859e16143051c7e52
parent 8fc3540fdf759ff3bb03b00e81d94d6c4102d530
parent 11ddf533a2165ca68002d3b48e312271b3d0dedb
author Daniel Sandler <dsandler@android.com> 1321511624 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1321511624 -0800

Merge "Disable desk dock apps." into ics-mr1