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.
Merge commit '82e037a4ed8ef38a4ca45e0058cf179111f1e98f' into eclair-plus-aosp
* commit '82e037a4ed8ef38a4ca45e0058cf179111f1e98f':
doc change: remove existing (unchanged since sdk) samples from zip. This now contains only new samples.
Merge commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d' into eclair-mr2-plus-aosp
* commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d':
Squashed commit of the following:
Merge commit '0249c83ed014cc6a36caac30e55db62c29c204e2'
* commit '0249c83ed014cc6a36caac30e55db62c29c204e2':
throw if we have a null typeface native instance (so we don't crash in native code)
Merge commit '31a69fdbe1edd8d686043e8ca7d278289f65808e' into eclair-mr2-plus-aosp
* commit '31a69fdbe1edd8d686043e8ca7d278289f65808e':
throw if we have a null typeface native instance (so we don't crash in native code)
Merge commit 'aaab0b64e53db6e174236b022526a5f207b28570'
* commit 'aaab0b64e53db6e174236b022526a5f207b28570':
add -since flag to droiddoc options for 7.xml,
Merge commit 'f0cdfa9955725c99cd4df6b933e4cb732847ebd1' into eclair-plus-aosp
* commit 'f0cdfa9955725c99cd4df6b933e4cb732847ebd1':
add -since flag to droiddoc options for 7.xml,
Merge commit 'c57930aa679385b87852a9805b971a4fb91c65be'
* commit 'c57930aa679385b87852a9805b971a4fb91c65be':
Added the Protractor algorithm for calculating the minimum cosine distance between gestures
Merge commit 'e96b6838b5a7ec3b4368e2449af9fbf0a8b75f16' into eclair-mr2-plus-aosp
* commit 'e96b6838b5a7ec3b4368e2449af9fbf0a8b75f16':
Added the Protractor algorithm for calculating the minimum cosine distance between gestures
Merge commit '492604e95239c1427dd5acb9109eb8acaaafc50d' into eclair-mr2-plus-aosp
* commit '492604e95239c1427dd5acb9109eb8acaaafc50d':
Update OBEX lib setPath Flags handling logic to be compatible with spec.
Merge commit '43ad522d49dd3f89d7e367112fab64e4d5027bf3' into eclair-mr2-plus-aosp
* commit '43ad522d49dd3f89d7e367112fab64e4d5027bf3':
Add a callback for the ConnectSink Call.
