Merge commit 'ff0ab64ca49c7a03835d414cd493d5dc37c2eb5e' into gingerbread-plus-aosp
* commit 'ff0ab64ca49c7a03835d414cd493d5dc37c2eb5e':
Add a seek test to the stagefright commandline tool.
Merge commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9' into gingerbread-plus-aosp
* commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9':
Fix a merge problem with html mms
Merge commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff' into gingerbread
* commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff':
Fix a merge problem with html mms
Merge commit '8138e841a5adb3c5629e263f5a8cb2e936d234ce' into gingerbread-plus-aosp
* commit '8138e841a5adb3c5629e263f5a8cb2e936d234ce':
Support finer seek control on MediaSources.
Merge commit '7070b36549d511d6627538c73dfbab23fbae5b43' into gingerbread-plus-aosp
* commit '7070b36549d511d6627538c73dfbab23fbae5b43':
Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
Merge commit '29e25bd3418b04e395119bf99abe92898830a796' into gingerbread-plus-aosp
* commit '29e25bd3418b04e395119bf99abe92898830a796':
Only print out wake locks in the if the wakelock was held.
Merge commit '3c1363beec9c142c062d8704b8bef4230b42eae5' into gingerbread-plus-aosp
* commit '3c1363beec9c142c062d8704b8bef4230b42eae5':
COMMENT ONLY change to add some warnings about ParcelFileDescriptor
Merge commit '60a200617791cf4dd3660c514ac6bf17dfcb85de' into gingerbread-plus-aosp
* commit '60a200617791cf4dd3660c514ac6bf17dfcb85de':
docs: add information about using color resources as drawables
Merge commit '2f0dc6d9f50ceece294e9db393583e655d3bf781' into gingerbread
* commit '2f0dc6d9f50ceece294e9db393583e655d3bf781':
COMMENT ONLY change to add some warnings about ParcelFileDescriptor
Merge commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a' into gingerbread-plus-aosp
* commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a':
COMMENT-ONLY change to clarify Camera documentation.
Merge commit '2316d6260862230af10d8ca3ff446ad3f560f712' into gingerbread
* commit '2316d6260862230af10d8ca3ff446ad3f560f712':
docs: add information about using color resources as drawables
Merge commit 'cc14a8393b92cd1ed6cba74829396045605ab211' into gingerbread-plus-aosp
* commit 'cc14a8393b92cd1ed6cba74829396045605ab211':
Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
Merge commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc' into gingerbread-plus-aosp
* commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc':
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
remove old sensor service and implement SensorManager
on top of the new (native) SensorManger API.
Change-Id: Iddb77d498755da3e11646473a44d651f12f40281
Merge commit 'ff7049ab2886acc73e145367118646f7741ce333' into gingerbread-plus-aosp
* commit 'ff7049ab2886acc73e145367118646f7741ce333':
Remove some debug logging that I accidentally committed.
Merge commit 'f23682f128151def4d83d3e2422aea36e0a00061' into gingerbread-plus-aosp
* commit 'f23682f128151def4d83d3e2422aea36e0a00061':
fixed parsing issue in BluetoothService so that it parses the UUID property correctly
Merge commit '80e62ac61c297452c003919f71c4dcd7063d1b43' into gingerbread-plus-aosp
* commit '80e62ac61c297452c003919f71c4dcd7063d1b43':
Fix the layoutlib Paint.set(Paint) method. Do not merge.
