Merge commit '3338775df7a19e0785c9badcedd90b99cda22013'
* commit '3338775df7a19e0785c9badcedd90b99cda22013':
Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.
Merge commit '4b9baa69f3b3146edbc623f0670103265c4f4fe5' into gingerbread-plus-aosp
* commit '4b9baa69f3b3146edbc623f0670103265c4f4fe5':
Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.
Merge commit '2651504c020f07847bafa3d539c36f1396629669' into gingerbread
* commit '2651504c020f07847bafa3d539c36f1396629669':
Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.
Merge commit 'b35988329ac1a574898db9226039e37e352c57a8'
* commit 'b35988329ac1a574898db9226039e37e352c57a8':
Allow application to set two more encoding paramters: video profile and level
Merge commit 'c42433427a7ed51b5577b2587bf6cb0af903ebf8' into gingerbread-plus-aosp
* commit 'c42433427a7ed51b5577b2587bf6cb0af903ebf8':
Allow application to set two more encoding paramters: video profile and level
Merge commit '58c35573cc677b736efefa267eba8727d4411999' into gingerbread-plus-aosp
* commit '58c35573cc677b736efefa267eba8727d4411999':
Fix some bugs in the MediaProfileReader
Merge commit 'dcf872dcfa6439514c886f8b9bf997beeeb3be85'
* commit 'dcf872dcfa6439514c886f8b9bf997beeeb3be85':
Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing.
Merge commit 'c34c8c3fe7fef15b410b0544d5436fcbefccd610' into gingerbread-plus-aosp
* commit 'c34c8c3fe7fef15b410b0544d5436fcbefccd610':
Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing.
Merge commit '3b09d64a20732c2f8f65f191899b991417cad51c'
* commit '3b09d64a20732c2f8f65f191899b991417cad51c':
More improvements to the SensorManager documentation
Merge commit 'ef52b5682d8c6ab3a384da5151f0e4dd6e9a5506' into gingerbread-plus-aosp
* commit 'ef52b5682d8c6ab3a384da5151f0e4dd6e9a5506':
More improvements to the SensorManager documentation
Merge commit 'ff119e746afe834040afb1631caee355d94237e8'
* commit 'ff119e746afe834040afb1631caee355d94237e8':
Make sure the OMX callback thread is properly shutdown after the node goes away.
Merge commit '2e6aff8e19ce8292a36fe211f8051dccf1fb9670' into gingerbread-plus-aosp
* commit '2e6aff8e19ce8292a36fe211f8051dccf1fb9670':
ALooperRoster no longer holds strong references to handlers and loopers.
Merge commit '6615defd4b8ae627e7f0bbb2382c4d86481f76bd' into gingerbread-plus-aosp
* commit '6615defd4b8ae627e7f0bbb2382c4d86481f76bd':
Make sure the OMX callback thread is properly shutdown after the node goes away.
Merge commit '877045aa853aaf6e58ca3ac7bfa2bde9165b55ae'
* commit '877045aa853aaf6e58ca3ac7bfa2bde9165b55ae':
An AHandler can now find its associated ALooper.
Merge commit '9406f626b2d8f64a084d41f6ea379e539b162a55' into gingerbread-plus-aosp
* commit '9406f626b2d8f64a084d41f6ea379e539b162a55':
An AHandler can now find its associated ALooper.
This allows us to avoid exposing the file descriptor of
the event queue; instead, you attach an event queue to
a looper. This will also should allow native apps to be
written without the need for a separate thread, by attaching
the event queue to the main thread's looper and scheduling
their own messages there.
Change-Id: I38489282635895ae2cbfacb88599c1b1cad9b239
Merge commit '5219a82f9d64a7d13401dcf9a0703a0ca2cd842d'
* commit '5219a82f9d64a7d13401dcf9a0703a0ca2cd842d':
Fix a bug that prevented the creation of EGL shared contexts.
Merge commit '8ecfb60a8e74dfcd51bbf3f236d5f414a4d5ac7d' into gingerbread-plus-aosp
* commit '8ecfb60a8e74dfcd51bbf3f236d5f414a4d5ac7d':
Fix a bug that prevented the creation of EGL shared contexts.
