Merge commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5' into kraken
* commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5':
Support to display message when operation is blocked due to FDN being enabled
Merge commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2' into kraken
* commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2':
Notify user regarding invalid number during MO call.
Build software AGL library with correct get_tls() macro for ARMv7 based platforms
Fix glReadPixels() to verify that both x and y are non-negative.
Merge commit '052e2102df8e45af2797faff7aefda26aeb345d7' into kraken
* commit '052e2102df8e45af2797faff7aefda26aeb345d7':
Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
Merge commit 'a250e3287dea625930b1591b7139decc304bf76b' into kraken
* commit 'a250e3287dea625930b1591b7139decc304bf76b':
docs: remove the dashboard from the sidenav for the offline docs
Merge commit '21f18e9633967e69ebe7a172b902420fec485bba' into kraken
* commit '21f18e9633967e69ebe7a172b902420fec485bba':
docs: make Notifying the User an expandable list
Merge commit 'd522b270a90cdd5f9bdedeb402b4738cfa294ee5' into kraken
* commit 'd522b270a90cdd5f9bdedeb402b4738cfa294ee5':
docs: add quickview box with "see also" links for some articles
Merge commit 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b' into kraken
* commit 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b':
Don't clear the _data column in the audio_meta table, since it isn't
Merge commit 'd2084bb689bb680eb886d5cfbd27adc6f2e9da1c' into kraken
* commit 'd2084bb689bb680eb886d5cfbd27adc6f2e9da1c':
LocationManagerService: Call updateNetworkState on providers that are disabled.
Merge commit 'b003ad17bffeba7875b9708ffeef2300ef28c916' into kraken
* commit 'b003ad17bffeba7875b9708ffeef2300ef28c916':
Support for customizable socket-read timeouts through the HTTP response.
Merge commit '227e443a43d70b9463b2e685688f73cfb1b72096' into kraken
* commit '227e443a43d70b9463b2e685688f73cfb1b72096':
Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
Merge commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85' into kraken
* commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85':
Update javadoc in android.media.AudioManager to not hide the
Merge commit '0d1b0814be24f501395bf175fba8691117f782d5' into froyo-plus-aosp
* commit '0d1b0814be24f501395bf175fba8691117f782d5':
Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
Merge commit '827a50dda4c1900ab5333f8c2d3705796ff4649d' into froyo-plus-aosp
* commit '827a50dda4c1900ab5333f8c2d3705796ff4649d':
docs: remove the dashboard from the sidenav for the offline docs
Merge commit 'bb129dc57b4a5be24ab7c5e436fa591f61e28d3d' into froyo-plus-aosp
* commit 'bb129dc57b4a5be24ab7c5e436fa591f61e28d3d':
docs: make Notifying the User an expandable list
Merge commit 'a225e3b1cd02da0f748f1a8e7341c727eff28085' into froyo-plus-aosp
* commit 'a225e3b1cd02da0f748f1a8e7341c727eff28085':
docs: add quickview box with "see also" links for some articles
Merge commit '836b2d75ef86487ecae0ae834ecbab324fd99471' into froyo-plus-aosp
* commit '836b2d75ef86487ecae0ae834ecbab324fd99471':
Don't clear the _data column in the audio_meta table, since it isn't
Merge commit 'e1d7dca608ced72c75bf906c7267a1ef30349826' into froyo-plus-aosp
* commit 'e1d7dca608ced72c75bf906c7267a1ef30349826':
LocationManagerService: Call updateNetworkState on providers that are disabled.
Merge commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc' into froyo-plus-aosp
* commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc':
Support for customizable socket-read timeouts through the HTTP response.
Merge commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e' into froyo-plus-aosp
* commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e':
Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
Merge commit '3e90c76c12803cd1b116030fd124b7b870d25342' into froyo-plus-aosp
* commit '3e90c76c12803cd1b116030fd124b7b870d25342':
Update javadoc in android.media.AudioManager to not hide the
