a30b596d6a
Merge commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f' into froyo-plus-aosp * commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f': @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE