Merge commit '73d403324bd8af48b20fc1bbbb2cf3502f1407cd'
* commit '73d403324bd8af48b20fc1bbbb2cf3502f1407cd':
Check if another Activity wants to intercept an xml mime type.
Merge commit 'c593d60787e9abd75c94f70bd929ae13414411e9' into eclair-mr2-plus-aosp
* commit 'c593d60787e9abd75c94f70bd929ae13414411e9':
Check if another Activity wants to intercept an xml mime type.
Merge commit '8ad6ec2eb4a58a6dad34be60d49f32a53f2419f4'
* commit '8ad6ec2eb4a58a6dad34be60d49f32a53f2419f4':
Implement new MockContentProvider. Also make ContentProvider aware of the class.
Merge commit 'f345a094e90be664f7390d12d505a052ac4b064f'
* commit 'f345a094e90be664f7390d12d505a052ac4b064f':
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
Merge commit 'a8dd0a545409af281b73e483dc203f6e3f8d1de6'
* commit 'a8dd0a545409af281b73e483dc203f6e3f8d1de6':
don't reschedule syncs that failed with a tooManyRetries error
Merge commit 'f4eb754b1810a60e640401396c1f9a10be65dffa'
* commit 'f4eb754b1810a60e640401396c1f9a10be65dffa':
Two more uses of strlcpy that break the sim build. Now fixed.
Merge commit '3bac3ad2dfb11c99ebfc5cd0374b29259686117e'
* commit '3bac3ad2dfb11c99ebfc5cd0374b29259686117e':
DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app.
Merge commit '06ef1d2104b4c90d5b134ae17e2562fd6bedda17'
* commit '06ef1d2104b4c90d5b134ae17e2562fd6bedda17':
Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
Merge commit '0633dc49fa7862bcd519555ec73803ab6379229d'
* commit '0633dc49fa7862bcd519555ec73803ab6379229d':
add BluetoothChat sample app to the dev guide
Merge commit 'b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4'
* commit 'b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4':
I accidentally broke this code while refactoring MediaScanner. This is the fix.
Merge commit '0f6357d855a328eb62210feccff5e44c81578553'
* commit '0f6357d855a328eb62210feccff5e44c81578553':
Add isPrintableAscii() and isPrintableAsciiOnly() to TextUtils.java as hidden methods, and make vCard code use them.
Merge commit '874c508c5352936c0640317ef44b81c9b632dfd6'
* commit '874c508c5352936c0640317ef44b81c9b632dfd6':
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
Merge commit 'ca84ac88c7f6940677f9b796b21779e53965bf06'
* commit 'ca84ac88c7f6940677f9b796b21779e53965bf06':
base: process: Abort setting the process group if one of the threads fails to switch
Merge commit 'b06ecc401160c5906fd1f4c85f61163bc2875200'
* commit 'b06ecc401160c5906fd1f4c85f61163bc2875200':
Remove old hack A/V sync hack that is no longer needed.
Merge commit '20e7c267c8f8d2de8f121bbf20f5d34487f17997'
* commit '20e7c267c8f8d2de8f121bbf20f5d34487f17997':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Merge commit '25bd4f29e1720d78d164c9749f786a2add6cafe9'
* commit '25bd4f29e1720d78d164c9749f786a2add6cafe9':
dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj.
Merge commit '8280c2b15f6875b2d387c05df23d264864eb9cd5' into eclair-mr2-plus-aosp
* commit '8280c2b15f6875b2d387c05df23d264864eb9cd5':
Implement new MockContentProvider. Also make ContentProvider aware of the class.
Merge commit '104d3f755e5ebc15d66154526c2c149beb33a7ee' into eclair-mr2-plus-aosp
* commit '104d3f755e5ebc15d66154526c2c149beb33a7ee':
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
Merge commit '39b082356851e29ba7a0af981eaa27d3b08a387b' into eclair-mr2-plus-aosp
* commit '39b082356851e29ba7a0af981eaa27d3b08a387b':
Add API level 8, currently a copy of 7.
Merge commit '298de218c540eab6c4e6c3415ab8a5c985c57772' into eclair-mr2-plus-aosp
* commit '298de218c540eab6c4e6c3415ab8a5c985c57772':
don't reschedule syncs that failed with a tooManyRetries error
Merge commit '20b213c7dd9d18d092a60ea176dd83cc29d6be80'
* commit '20b213c7dd9d18d092a60ea176dd83cc29d6be80':
Document that stopPreview is not needed before takePicture.
Merge commit '0ce8431c15078e095a22a123dbabcd91049a9652' into eclair-mr2
* commit '0ce8431c15078e095a22a123dbabcd91049a9652':
don't reschedule syncs that failed with a tooManyRetries error
Merge commit '2a428fd463431e2b3d3680faf2e9640989ca7791' into eclair-mr2-plus-aosp
* commit '2a428fd463431e2b3d3680faf2e9640989ca7791':
Two more uses of strlcpy that break the sim build. Now fixed.
Merge commit '9737dc4de2ce56c5fb3d6911e48cfbfd63a19325' into eclair-mr2-plus-aosp
* commit '9737dc4de2ce56c5fb3d6911e48cfbfd63a19325':
DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app.
Merge commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e' into eclair-mr2-plus-aosp
* commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e':
Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
Merge commit 'e08361d7fda2234f447f4ffb7f480d045f8c5f78' into eclair-mr2-plus-aosp
* commit 'e08361d7fda2234f447f4ffb7f480d045f8c5f78':
add BluetoothChat sample app to the dev guide
