Merge commit 'ea8eafad4f5438ec1291d45376959a996d36e15e'
* commit 'ea8eafad4f5438ec1291d45376959a996d36e15e':
Make bad notifications crash their application.
Merge commit '2529a45339b7e02d9d2b813358bcecd144a971ea' into gingerbread-plus-aosp
* commit '2529a45339b7e02d9d2b813358bcecd144a971ea':
Make bad notifications crash their application.
Merge commit 'cac3126c6109854640266c4807e5aa8e6a87142f'
* commit 'cac3126c6109854640266c4807e5aa8e6a87142f':
Properly note the current active restore set's token
Merge commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961' into gingerbread-plus-aosp
* commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961':
Properly note the current active restore set's token
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into froyo-plus-aosp
* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
Properly note the current active restore set's token
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into gingerbread
* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
Properly note the current active restore set's token
Merge commit '9bf39efb1b8527d7c46b20538cbb75bd60900b44' into gingerbread-plus-aosp
* commit '9bf39efb1b8527d7c46b20538cbb75bd60900b44':
Do not log AT command traffic by default.
Merge commit 'ab04f97855a5097815e8e7b99beb42e9b3bac388' into gingerbread-plus-aosp
* commit 'ab04f97855a5097815e8e7b99beb42e9b3bac388':
Do not log AT command traffic by default.
Merge commit 'd19c397b04f485e0af5990f3541e703934869290' into gingerbread
* commit 'd19c397b04f485e0af5990f3541e703934869290':
Do not log AT command traffic by default.
Merge commit 'd19c397b04f485e0af5990f3541e703934869290' into froyo-plus-aosp
* commit 'd19c397b04f485e0af5990f3541e703934869290':
Do not log AT command traffic by default.
Merge commit '5da347dd2dc7de8828077057f4963b904018c5ec'
* commit '5da347dd2dc7de8828077057f4963b904018c5ec':
Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
DO NOT MERGE Add new permission to allow access to USB devices
Merge commit '477def1d4216f82bdfe58525131db88b384fc5a5' into gingerbread-plus-aosp
* commit '477def1d4216f82bdfe58525131db88b384fc5a5':
Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
DO NOT MERGE Add new permission to allow access to USB devices
* changes:
Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
DO NOT MERGE Add new permission to allow access to USB devices
Merge commit '0d964c94459e25b9b2221a7c7c789b29f77f15dd'
* commit '0d964c94459e25b9b2221a7c7c789b29f77f15dd':
Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
Merge commit 'a2549bb644d8ca4b0209d6d2f0c4160521789aa9' into gingerbread-plus-aosp
* commit 'a2549bb644d8ca4b0209d6d2f0c4160521789aa9':
Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
Merge commit '801b63d3b865054b3015e2cf315ca7c9386d1212'
* commit '801b63d3b865054b3015e2cf315ca7c9386d1212':
Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
Merge commit '51e895f055f76ad0114a18e1b754a1475a62c524' into gingerbread-plus-aosp
* commit '51e895f055f76ad0114a18e1b754a1475a62c524':
Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
Merge commit 'bc0793e4b77f1f8ec30294a4edac67dfca81f31d'
* commit 'bc0793e4b77f1f8ec30294a4edac67dfca81f31d':
Remember to initialize timestamps in the dispatch allocator
Merge commit '0379118827ef7e81a70e88e5910f5c7536d8b945' into gingerbread-plus-aosp
* commit '0379118827ef7e81a70e88e5910f5c7536d8b945':
Remember to initialize timestamps in the dispatch allocator
Merge commit '2d8e249854d134f87423646cc96d1cd9507a67b0'
* commit '2d8e249854d134f87423646cc96d1cd9507a67b0':
Fix bug 2772728 with the suggested fix. I wasn't able to reproduce it though.
Merge commit '4ca092c7f101cbd95833a9ed8936e9e0485585ad' into gingerbread-plus-aosp
* commit '4ca092c7f101cbd95833a9ed8936e9e0485585ad':
Fix bug 2772728 with the suggested fix. I wasn't able to reproduce it though.
Merge commit '90ade3f25d16afe8fd64ec1fcc5fede466256719'
* commit '90ade3f25d16afe8fd64ec1fcc5fede466256719':
Fixed some meta data issues in the recorded mp4 file
Merge commit '9afc1b3ed3eb8dbfb440600495d92def88934f54' into gingerbread-plus-aosp
* commit '9afc1b3ed3eb8dbfb440600495d92def88934f54':
Fixed some meta data issues in the recorded mp4 file
