Merge commit '3c1363beec9c142c062d8704b8bef4230b42eae5' into gingerbread-plus-aosp
* commit '3c1363beec9c142c062d8704b8bef4230b42eae5':
COMMENT ONLY change to add some warnings about ParcelFileDescriptor
Merge commit '60a200617791cf4dd3660c514ac6bf17dfcb85de' into gingerbread-plus-aosp
* commit '60a200617791cf4dd3660c514ac6bf17dfcb85de':
docs: add information about using color resources as drawables
Merge commit '2f0dc6d9f50ceece294e9db393583e655d3bf781' into gingerbread
* commit '2f0dc6d9f50ceece294e9db393583e655d3bf781':
COMMENT ONLY change to add some warnings about ParcelFileDescriptor
Merge commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a' into gingerbread-plus-aosp
* commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a':
COMMENT-ONLY change to clarify Camera documentation.
Merge commit '2316d6260862230af10d8ca3ff446ad3f560f712' into gingerbread
* commit '2316d6260862230af10d8ca3ff446ad3f560f712':
docs: add information about using color resources as drawables
Merge commit 'cc14a8393b92cd1ed6cba74829396045605ab211' into gingerbread-plus-aosp
* commit 'cc14a8393b92cd1ed6cba74829396045605ab211':
Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
Merge commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc' into gingerbread-plus-aosp
* commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc':
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
Merge commit 'ff7049ab2886acc73e145367118646f7741ce333' into gingerbread-plus-aosp
* commit 'ff7049ab2886acc73e145367118646f7741ce333':
Remove some debug logging that I accidentally committed.
Merge commit 'f23682f128151def4d83d3e2422aea36e0a00061' into gingerbread-plus-aosp
* commit 'f23682f128151def4d83d3e2422aea36e0a00061':
fixed parsing issue in BluetoothService so that it parses the UUID property correctly
Merge commit '80e62ac61c297452c003919f71c4dcd7063d1b43' into gingerbread-plus-aosp
* commit '80e62ac61c297452c003919f71c4dcd7063d1b43':
Fix the layoutlib Paint.set(Paint) method. Do not merge.
Merge commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599' into gingerbread-plus-aosp
* commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599':
Don't throw an exception from isProviderEnabled and getLastKnownLocation
Merge commit '2c87e9c923b0362fabf8c97ff63997542394c428' into gingerbread-plus-aosp
* commit '2c87e9c923b0362fabf8c97ff63997542394c428':
First submission of audio effect library from NXP software.
Merge commit 'd3616592fe1b315b589766c4b74ce728fc4968f5' into gingerbread-plus-aosp
* commit 'd3616592fe1b315b589766c4b74ce728fc4968f5':
Fix trackball down and movement bugs.
Merge commit 'b6761e73ce6b255cfe96bfa1fa6ac611abcfc067' into gingerbread-plus-aosp
* commit 'b6761e73ce6b255cfe96bfa1fa6ac611abcfc067':
Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
Merge commit 'c8c79a654d4ae8e3a883854e19cc2df757f72d82' into gingerbread-plus-aosp
* commit 'c8c79a654d4ae8e3a883854e19cc2df757f72d82':
Re-use existing Surface objects when reading them from parcels.
Merge commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2' into gingerbread
* commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2':
Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
