Merge commit '66e606040a521b81033ff75025620436c050c82e' into gingerbread-plus-aosp
* commit '66e606040a521b81033ff75025620436c050c82e':
GPS: More HAL initialization cleanup
- Register buffers with Gralloc when unflattening a GraphicBuffer (rather than
doing it in the Surface class).
- Add support for a GraphicBuffer that wraps an android_native_window_t*.
Change-Id: I029ac086111bbac800e5ca37eb505f558b718cd8
Merge commit 'f5cae7d1c516ad233d7ec833c23c046e2501ec56'
* commit 'f5cae7d1c516ad233d7ec833c23c046e2501ec56':
DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile.
Merge commit '6c4609ada4526eea2fca4eef043d27dd07026e0a'
* commit '6c4609ada4526eea2fca4eef043d27dd07026e0a':
DO NOT MERGE Only show edge glow effect on 1 side at a time.
Merge commit '4b7ff734611666a68471c97fabb6f516efab25cd'
* commit '4b7ff734611666a68471c97fabb6f516efab25cd':
Suppress harder for echo without affecting the volume of real voice.
Merge commit 'f10929fb350395c21edd2cba7641479afe75e750'
* commit 'f10929fb350395c21edd2cba7641479afe75e750':
Minor fix for InputReader support for non-touchscreen devices.
Merge commit '4f2c8cc86ad1b4c65806d7547407c60ea36b8abe'
* commit '4f2c8cc86ad1b4c65806d7547407c60ea36b8abe':
DO NOT MERGE Only show edge glow effect on 1 side at a time.
Merge commit 'd185494da653d1d0e4f20d28c2dd53764994fc3f'
* commit 'd185494da653d1d0e4f20d28c2dd53764994fc3f':
Port mock ril controller and tests to GB. DO NOT MERGE
Merge commit '22cb4ef8ce9c4d5536ac5cee5c40b82bfa56ccc5'
* commit '22cb4ef8ce9c4d5536ac5cee5c40b82bfa56ccc5':
Switch Looper back to using poll() instead of epoll().
Merge commit '7a64e3a6f3e9f4de9cb097f604187d06268c23be' into gingerbread-plus-aosp
* commit '7a64e3a6f3e9f4de9cb097f604187d06268c23be':
DO NOT MERGE Set the cap at alpha to 80% of the total available.
Merge commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090' into gingerbread-plus-aosp
* commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090':
Don't perform DNS lookup in android.net.Proxy.isLocalHost
Merge commit 'bb70837397e3fb437b7b4443b37d7a83c11e6e43'
* commit 'bb70837397e3fb437b7b4443b37d7a83c11e6e43':
Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
Merge commit 'b3616395660498ecfd2099b5ffcb9ff74e5aeaee'
* commit 'b3616395660498ecfd2099b5ffcb9ff74e5aeaee':
Fix bug 3071869 - text anchors are now treated as application sub-panels.
Merge commit '45bd1159fa34b51ba077e0cde760d171ca092552'
* commit '45bd1159fa34b51ba077e0cde760d171ca092552':
On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
Merge commit 'c296f22e713257271f95c2115df9e13d05d5687a'
* commit 'c296f22e713257271f95c2115df9e13d05d5687a':
Revert "Only allow 8 OBBs to be mounted by a UID"
Merge commit 'd14230f1c7aa5073db9d291f8fbd6da5491955b9' into gingerbread-plus-aosp
* commit 'd14230f1c7aa5073db9d291f8fbd6da5491955b9':
Made paste work in ExtractEditText
Merge commit '82aacddef99e5cfc399d02702f2a336af8fbd59f'
* commit '82aacddef99e5cfc399d02702f2a336af8fbd59f':
DO NOT MERGE Initialize bluetooth profiles in BT stress tests
Merge commit '2e99245e0e0d64ba6ab9227154c7fad132559c01'
* commit '2e99245e0e0d64ba6ab9227154c7fad132559c01':
Changed handling of onQueryCompelete to not use mimeType.
Merge commit '1c3ef78782cb3461ef83e0c337d03b6f677c94e5' into gingerbread-plus-aosp
* commit '1c3ef78782cb3461ef83e0c337d03b6f677c94e5':
GPS: Do not call sGpsInterface->init() multiple times
Merge commit 'dc2e5208e2b448a2c481d726818de79ea6a49783' into gingerbread-plus-aosp
* commit 'dc2e5208e2b448a2c481d726818de79ea6a49783':
Do not release the wifi lock if the screen is off.
