Dan Morrill 4ec33c2aad Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6
(package manager fix) to gingerbread.

Change-Id: Ia5373100e97bfe42d2211c6249996dc7ff4818e0
2011-05-02 17:00:13 -07:00
..