Merge commit 'df31e03c47cd4caf45d8a58cf1fe5893da48ec6c'
* commit 'df31e03c47cd4caf45d8a58cf1fe5893da48ec6c':
RTP: Delay the initialization of AudioTrack and AudioRecord.
Merge commit '387bdcdadc312c8e9f702da164bd8bd53cbd92fd'
* commit '387bdcdadc312c8e9f702da164bd8bd53cbd92fd':
Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
Merge commit '0d44776016cecf1c7c826c4784f8f867a56235f0'
* commit '0d44776016cecf1c7c826c4784f8f867a56235f0':
SIP: Feedback any provisional responses in addition to RING
Merge commit '05105f7abe02b2dff91d6260b3628c8b97816bab' into gingerbread-plus-aosp
* commit '05105f7abe02b2dff91d6260b3628c8b97816bab':
Update OBB API to include callbacks
Merge commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a' into gingerbread-plus-aosp
* commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a':
Check for the DEVICE_POWER permission in userActivity.
Merge commit '8110290388a68225b5dc9b5b987e4e6e583d78b2'
* commit '8110290388a68225b5dc9b5b987e4e6e583d78b2':
Add line break between PLMN and SPN in windowshade.
Merge commit '9d9719c44ad05834b48542ea0fc4edbb4f59c311'
* commit '9d9719c44ad05834b48542ea0fc4edbb4f59c311':
Move DownloadManager to android.app (DO NOT MERGE)
Merge commit '292c246b27319bc2195e2b3dbc3c3adea22db672' into gingerbread-plus-aosp
* commit '292c246b27319bc2195e2b3dbc3c3adea22db672':
Call functions to calculate deps and classes.jar
Measures the time to do nothing but clear the screen in an
OpenGL Java app. Spews frame time statistics to the log.
Control long frame time by setting debug.longframe_ms;
e.g., adb shell setprop debug.longframe_ms 33
Change-Id: I435a3cb170048349e00417c44db42121c68744b2
Merge commit '320cdcb122505ba703326a102f9b13d2f2f8847a' into gingerbread-plus-aosp
* commit '320cdcb122505ba703326a102f9b13d2f2f8847a':
RTP: Delay the initialization of AudioTrack and AudioRecord.
Merge commit 'd6c30e8c1521bc584f33500b8ee897dafdfec023'
* commit 'd6c30e8c1521bc584f33500b8ee897dafdfec023':
Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.
Merge commit 'c889bbfa965f4ba90636f561c5e1353289d4cb06'
* commit 'c889bbfa965f4ba90636f561c5e1353289d4cb06':
Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files.
Merge commit 'b763a6dc41dcce76585c56657903ae72c5422ae1'
* commit 'b763a6dc41dcce76585c56657903ae72c5422ae1':
Fixes to granting URI permissions - take into account path perms.
Merge commit '88a995edcf3c371845cb32aed8bcddb7509bf875' into gingerbread-plus-aosp
* commit '88a995edcf3c371845cb32aed8bcddb7509bf875':
Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
Merge commit '6d028dd2f102a6eafaa2edebeb55f55b4c32fc42' into gingerbread-plus-aosp
* commit '6d028dd2f102a6eafaa2edebeb55f55b4c32fc42':
SIP: Feedback any provisional responses in addition to RING
Merge commit 'd9743af92ead39b9f648043d165c415dfe8f3668' into gingerbread-plus-aosp
* commit 'd9743af92ead39b9f648043d165c415dfe8f3668':
New assets. DO NOT MERGE>
