Merge commit '4e4795c8c0934eb063048471037ecb8a713e85fd' into eclair-mr2-plus-aosp
* commit '4e4795c8c0934eb063048471037ecb8a713e85fd':
Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
* changes:
docs: add "required" attribute to the <uses-feature> docs and add a note to the CAMERA permission stating that it enables the <uses-feature> for camera. This is an incrimental update for the 2.0.1 docs. More changes to come for the 2.1 docs to include more features
Merge commit 'b9b9764bbbd668c1bd30a09d7c2c02b684731892'
* commit 'b9b9764bbbd668c1bd30a09d7c2c02b684731892':
docs: update the site homepage with 2.1 announcement
Merge commit 'a2bca7477d803541c5a48cc7624e2b6c305c5970'
* commit 'a2bca7477d803541c5a48cc7624e2b6c305c5970':
docs: update the Bluetooth guide with links to the sample
Merge commit '673b937889d550700d9d4a80aefeedd5ebf3ecb4' into eclair-plus-aosp
* commit '673b937889d550700d9d4a80aefeedd5ebf3ecb4':
docs: update the site homepage with 2.1 announcement
Merge commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad' into eclair-plus-aosp
* commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad':
docs: update the Bluetooth guide with links to the sample
* changes:
docs: update the Bluetooth guide with links to the sample app, scrub the sibling files, and revise the Bluetooth package summary to point to the BT dev guide.
Merge commit '5ee51f07356b81ff2b026ef864f2f6349994e3fc'
* commit '5ee51f07356b81ff2b026ef864f2f6349994e3fc':
Fix 2318046: Modify PIN entry layout in keyguard so it works well on HVGA as well as WVGA devices.
Merge commit '47c38f00ab464a8fdb6ae2d819ae189c17b72410'
* commit '47c38f00ab464a8fdb6ae2d819ae189c17b72410':
Issue #2335763: Cant dial emergency number on my device
Merge commit '558947c9899627067d632e8a6365f77a35f433e1' into eclair-plus-aosp
* commit '558947c9899627067d632e8a6365f77a35f433e1':
Issue #2335763: Cant dial emergency number on my device
Merge commit '05de7c882e0ae8d9ea10f4de9421b2e05bf29fa9' into eclair-mr2-plus-aosp
* commit '05de7c882e0ae8d9ea10f4de9421b2e05bf29fa9':
Fix 2318046: Modify PIN entry layout in keyguard so it works well on HVGA as well as WVGA devices.
Merge commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233' into eclair-mr2-plus-aosp
* commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233':
Add support for XING header
* changes:
Updated test GridTouchVerticalSpacingStackFromBottomTest for larger screens. Addresses bug 2176089 http://b/issue?id=2176089 Now takes into account screen scaling.
In the process of making Mms unbundled, copy a few non-public-API
classes into the android-common library. The Mms app now uses this
library. The next step is to update the other apps that use these classes
and then delete the classes from their original location.
Merge commit '5614c2c677ce08561c93c6385dc3090dbf5760dc'
* commit '5614c2c677ce08561c93c6385dc3090dbf5760dc':
Initial checkins of the mpeg4 and h263 software decoders based on PV
Merge commit '02f5b5447de349216a40086ca6061efefb5a3025' into eclair-mr2-plus-aosp
* commit '02f5b5447de349216a40086ca6061efefb5a3025':
Initial checkins of the mpeg4 and h263 software decoders based on PV
Merge commit '66cc5900a53b22326bce053973730a301732efe9' into eclair-mr2-plus-aosp
* commit '66cc5900a53b22326bce053973730a301732efe9':
changed SettingsProvider to manage the androidid itself
Merge commit '4986934e189032dba43676973038879b5f90a406' into eclair-mr2-plus-aosp
* commit '4986934e189032dba43676973038879b5f90a406':
Remove the IM provider contract class.
Merge commit '6fda019bdcf9f9c172155aa2f2bb07afbe01fad9'
* commit '6fda019bdcf9f9c172155aa2f2bb07afbe01fad9':
doc change: remove existing (unchanged since sdk) samples from zip. This now contains only new samples.
