Merge commit 'f18a01c77e78209b74e34d05cfb352fa4a92db5f' into eclair-mr2-plus-aosp * commit 'f18a01c77e78209b74e34d05cfb352fa4a92db5f': Rename [I]DropBox[Service] to [I]DropBoxManager[Service].
Merge commit 'f18a01c77e78209b74e34d05cfb352fa4a92db5f' into eclair-mr2-plus-aosp * commit 'f18a01c77e78209b74e34d05cfb352fa4a92db5f': Rename [I]DropBox[Service] to [I]DropBoxManager[Service].