Merge commit '119a767565399809d222ddda6392e5e58942d5e6' into eclair-plus-aosp
* commit '119a767565399809d222ddda6392e5e58942d5e6':
Fix issue #2246723: Only one Application object gets onCreate called
Merge commit '119a767565399809d222ddda6392e5e58942d5e6' into eclair-mr2
* commit '119a767565399809d222ddda6392e5e58942d5e6':
Fix issue #2246723: Only one Application object gets onCreate called
Merge commit '8e5cee5d26cfb08e72199280a4be86e9f85c43fe'
* commit '8e5cee5d26cfb08e72199280a4be86e9f85c43fe':
docs: add more documentation for the bluetooth apis.
Merge commit 'b262f50af9ad22837af9e88e6c8f71b44cdefd56' into eclair-mr2-plus-aosp
* commit 'b262f50af9ad22837af9e88e6c8f71b44cdefd56':
docs: add more documentation for the bluetooth apis.
Merge commit '13ce56bdbc4872c0b12caff501e063f5a75073db' into eclair-mr2
* commit '13ce56bdbc4872c0b12caff501e063f5a75073db':
docs: add more documentation for the bluetooth apis.
Merge commit '13ce56bdbc4872c0b12caff501e063f5a75073db' into eclair-plus-aosp
* commit '13ce56bdbc4872c0b12caff501e063f5a75073db':
docs: add more documentation for the bluetooth apis.
Merge commit '88427cff609e668185010af2244500be5823595e' into eclair
* commit '88427cff609e668185010af2244500be5823595e':
docs: add more documentation for the bluetooth apis.
e.g. "# Comment?"
In both vCard 2.1 and vCard 3.0, this syntax is never allowed, but some actual exporter seems to emit this kind of comment sometimes.
Both vCard 2.1 and vCard 3.0 allows some property to use multiple lines, so this change may cause another problem.
For example, if the "NOTE" property uses Quoted-Printable type, has several lines, and one of the lines starts with '#', we cannot know whether the line is "comment" or not.
Fortunately, in this change, the line is parsed as part of "NOTE" property, so I think there's no problem "right now", which does not mean that it is completely fine with vCard files Android will encounter in the future.
This change is already submitted into MR2.
Internal issue number: 2245363
Merge commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4'
* commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit '949ffa3da5231772425c3bde50caeab6c4d08ec5' into eclair-mr2-plus-aosp
* commit '949ffa3da5231772425c3bde50caeab6c4d08ec5':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-mr2
* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-plus-aosp
* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit '9e0da5bd2d40b33d7de8897aa5e95a06d42fd990'
* commit '9e0da5bd2d40b33d7de8897aa5e95a06d42fd990':
Make vCard exporter check invalid phone numbers and re-format them if needed.
Merge commit '452a52968f43c21e9a040009e209df023a34876c' into eclair-mr2-plus-aosp
* commit '452a52968f43c21e9a040009e209df023a34876c':
Make vCard exporter check invalid phone numbers and re-format them if needed.
Merge commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525' into eclair-mr2-plus-aosp
* commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525':
Fix code example in Parcelable javadoc
Merge commit '2bb53754337225508f2b4d12f1575df7c226100c' into eclair-mr2
* commit '2bb53754337225508f2b4d12f1575df7c226100c':
Fix code example in Parcelable javadoc
Merge commit '6720bb8314600a2b55a18159b4a22dc4b18aec88'
* commit '6720bb8314600a2b55a18159b4a22dc4b18aec88':
new gservices flag for delaying bad gmail operations
Merge commit '29c00b0f09777c0ef94b53a0a7333d8416fb7abf'
* commit '29c00b0f09777c0ef94b53a0a7333d8416fb7abf':
Allow plugins to load java classes from their apk.
Merge commit '26c91fa694464c79de39988f9f42cee375ff0a14' into eclair-mr2-plus-aosp
* commit '26c91fa694464c79de39988f9f42cee375ff0a14':
new gservices flag for delaying bad gmail operations
Merge commit '521123e0ed91348be81d3d754d3ee13ecf454ced' into eclair-mr2-plus-aosp
* commit '521123e0ed91348be81d3d754d3ee13ecf454ced':
Allow plugins to load java classes from their apk.
Merge commit '977e8d28e5e4f8dbb8997b2206a943e17f8be5bb'
* commit '977e8d28e5e4f8dbb8997b2206a943e17f8be5bb':
Add postdata identifier so that if we cache the post
Merge commit 'c53cc103908fbd73bebf45f1dab36dc808439c2e'
* commit 'c53cc103908fbd73bebf45f1dab36dc808439c2e':
Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
Merge commit '75face7d2dad974781a5aaf48e0d20ebe6e0ca35'
* commit '75face7d2dad974781a5aaf48e0d20ebe6e0ca35':
Make vCard parser invalid lines in vCard file which look like some comment.
Merge commit 'ac94fbd081450ae7f208e4525b23b36d90d382e0'
* commit 'ac94fbd081450ae7f208e4525b23b36d90d382e0':
Capture failure of copybit->stretch()
Fix obvious typo bug in egl.cpp
LocationManagerService: Fix race when removing LocationListener
Don't return when blocking is true.
Fix of compatibility with multifunction extUSB adapters.
Fix documentation example, per issue 895 on android.googlecode.com
Merge commit 'e81c9609cc99d10045b70f79729b4b0edbf793c2' into eclair-mr2-plus-aosp
* commit 'e81c9609cc99d10045b70f79729b4b0edbf793c2':
Add postdata identifier so that if we cache the post
Merge commit '0e983864fca215513de9664573dcc3bbadf41e79' into eclair-mr2-plus-aosp
* commit '0e983864fca215513de9664573dcc3bbadf41e79':
Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
Merge commit 'df0ce74126e75963a33201b6c98ce46837a2e55e' into eclair-mr2-plus-aosp
* commit 'df0ce74126e75963a33201b6c98ce46837a2e55e':
Make vCard parser invalid lines in vCard file which look like some comment.
Merge commit '2bb53754337225508f2b4d12f1575df7c226100c' into eclair-plus-aosp
* commit '2bb53754337225508f2b4d12f1575df7c226100c':
Fix code example in Parcelable javadoc
Provide the functions to be called from native code that take
the plugin's location and desired class name and then load that
class from the plugin's apk if it is available.
see http://b/2215696
