Merge commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf' into gingerbread-plus-aosp
* commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf':
dependent change for "parse instrumentation result bundles" in sdk
Merge commit '4782cdbbbe4b2c7714af1fb6cdc4f52f1d1d20d7' into gingerbread-plus-aosp
* commit '4782cdbbbe4b2c7714af1fb6cdc4f52f1d1d20d7':
Fix a memory corruption when writting Sensor into a parcel
Merge commit '53d4e0d58e2d5c18f6e026c705af833b9bdd7aba' into gingerbread-plus-aosp
* commit '53d4e0d58e2d5c18f6e026c705af833b9bdd7aba':
Allows the authoring engine to skip frame.
Merge commit 'db3eb3553502d142c85d47ec4fb847b7fa3b06fa' into gingerbread-plus-aosp
* commit 'db3eb3553502d142c85d47ec4fb847b7fa3b06fa':
propagate sensor event rate properly to the sensor HAL
Merge commit '81046c8c42ff3b630c6496deafd44f2a07a25463' into gingerbread-plus-aosp
* commit '81046c8c42ff3b630c6496deafd44f2a07a25463':
Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.
Merge commit 'e7486695ced2dd135f6e2223b582adde4155b917' into gingerbread-plus-aosp
* commit 'e7486695ced2dd135f6e2223b582adde4155b917':
Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE
Merge commit 'b42aa98d44f1ad22746005264274220770de2756' into gingerbread-plus-aosp
* commit 'b42aa98d44f1ad22746005264274220770de2756':
Correct VM number updation during MBDN refresh.
Merge commit 'b8e07a51c1849d6894c5773a3daacedd01294218' into gingerbread-plus-aosp
* commit 'b8e07a51c1849d6894c5773a3daacedd01294218':
DL manager support for broadcasts + connectivity control
Merge commit '5df13ef30e7dd58e4e718e6d949ac3d1f5af94e0' into gingerbread-plus-aosp
* commit '5df13ef30e7dd58e4e718e6d949ac3d1f5af94e0':
SensorService doesn't crash if correct HAL is not present
Merge commit '865991b075de1df8144426b5c2b2f341e4e33d33' into gingerbread-plus-aosp
* commit '865991b075de1df8144426b5c2b2f341e4e33d33':
Added partial support for repporting sensor activity to IBatteryStats
Merge commit 'e4764521353e898554931a557460fc49209fb0a9' into gingerbread-plus-aosp
* commit 'e4764521353e898554931a557460fc49209fb0a9':
new SensorService
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