Merge commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9' into gingerbread-plus-aosp
* commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9':
Fix the notification vibration setting and add a test app that lets you recover from the busted
Merge commit '2529a45339b7e02d9d2b813358bcecd144a971ea' into gingerbread-plus-aosp
* commit '2529a45339b7e02d9d2b813358bcecd144a971ea':
Make bad notifications crash their application.
Merge commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961' into gingerbread-plus-aosp
* commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961':
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 '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 '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 '51e895f055f76ad0114a18e1b754a1475a62c524' into gingerbread-plus-aosp
* commit '51e895f055f76ad0114a18e1b754a1475a62c524':
Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
Merge commit '0379118827ef7e81a70e88e5910f5c7536d8b945' into gingerbread-plus-aosp
* commit '0379118827ef7e81a70e88e5910f5c7536d8b945':
Remember to initialize timestamps in the dispatch allocator
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 '9afc1b3ed3eb8dbfb440600495d92def88934f54' into gingerbread-plus-aosp
* commit '9afc1b3ed3eb8dbfb440600495d92def88934f54':
Fixed some meta data issues in the recorded mp4 file
Merge commit '58e9402b12218ca498ea3b932e16819612b1ea87' into gingerbread-plus-aosp
* commit '58e9402b12218ca498ea3b932e16819612b1ea87':
Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
Merge commit 'b64af9a221c1df4853ab7c7766d5f956c61b8765' into gingerbread-plus-aosp
* commit 'b64af9a221c1df4853ab7c7766d5f956c61b8765':
Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
Merge commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf' into gingerbread-plus-aosp
* commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf':
Fix a bug where requestDisallowInterceptTouchEvent does not get called
Merge commit '9fe2c4e2b89cbe4e22fdbcb3d5ecae1a853b133e' into gingerbread-plus-aosp
* commit '9fe2c4e2b89cbe4e22fdbcb3d5ecae1a853b133e':
docs: update backup dev guide with Android Backup Service registration info
Merge commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b' into gingerbread
* commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b':
docs: update backup dev guide with Android Backup Service registration info
Merge commit '2c2ce8e53f5eb94916a5d0f40b2877cc7551870d' into gingerbread-plus-aosp
* commit '2c2ce8e53f5eb94916a5d0f40b2877cc7551870d':
Added support for audio sessions in MediaPlayer and AudioTrack.
Merge commit 'd1559d6b2db1d7e1718a15dc43a82450de2934db' into gingerbread-plus-aosp
* commit 'd1559d6b2db1d7e1718a15dc43a82450de2934db':
Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call.
