Commit Graph

24344 Commits

Author SHA1 Message Date
Brian Carlstrom
6c95b7983f Merge "Correctly parse cookies with spaces after = in attributes" 2010-11-10 08:52:33 -08:00
Owen Lin
61039d77d8 am 8ffb135d: am 45ca778d: Merge "Make sure the controller will get repositioned after size changing." into gingerbread
* commit '8ffb135dc892c09f1781231f783b0890515b3d60':
  Make sure the controller will get repositioned after size changing.
2010-11-10 08:37:51 -08:00
Owen Lin
110d8738e5 am 45ca778d: Merge "Make sure the controller will get repositioned after size changing." into gingerbread
* commit '45ca778d8ed90aff3f72fc85f806cedbd4121cc1':
  Make sure the controller will get repositioned after size changing.
2010-11-10 08:25:02 -08:00
Owen Lin
409a974bdd Merge "Make sure the controller will get repositioned after size changing." into gingerbread 2010-11-09 19:02:23 -08:00
Jim Miller
bf0b893331 Merge "Initial pass to update RecentApps panel to new UI specification." 2010-11-09 18:11:38 -08:00
Mathias Agopian
be2be90106 am 0e438287: am b48189cc: Merge "Improve gyro and accelerometer java doc" into gingerbread
* commit '0e438287995698aacdda715713300fc01a6d1585':
  Improve gyro and accelerometer java doc
2010-11-09 17:43:16 -08:00
Jason Sams
23b9bd6674 Merge "Continue error check improvements and write some docs." 2010-11-09 17:38:20 -08:00
Vasu Nori
dc19a9b88b Merge "on readonly databases, don't set journal mode and don't allow WAL" 2010-11-09 17:29:37 -08:00
Mathias Agopian
ddb17b3221 am b48189cc: Merge "Improve gyro and accelerometer java doc" into gingerbread
* commit 'b48189ccfe42a408fb713565e54e165d255c6d66':
  Improve gyro and accelerometer java doc
2010-11-09 17:24:57 -08:00
Shimeng (Simon) Wang
6bdea053b1 Merge "Update textwrap scale when content width changes in overview mode." 2010-11-09 17:15:02 -08:00
Mathias Agopian
4bf9ccb84b Merge "Improve gyro and accelerometer java doc" into gingerbread 2010-11-09 17:12:11 -08:00
David 'Digit' Turner
ab5426e53d am b02ca27f: am b7a109c0: Merge "Refresh EGL header to work with the NDK" into gingerbread
* commit 'b02ca27f05a47fad75c57d6d8c52ccc5b21a8043':
  Refresh EGL header to work with the NDK
2010-11-09 16:42:27 -08:00
Romain Guy
f859e66087 Merge "Fix possible crash when texture is NULL in the drop shadow cache." 2010-11-09 16:41:07 -08:00
David 'Digit' Turner
2346d0223f am b7a109c0: Merge "Refresh EGL header to work with the NDK" into gingerbread
* commit 'b7a109c02735bb0d9e0bcb8f84e4aa3923701460':
  Refresh EGL header to work with the NDK
2010-11-09 16:25:58 -08:00
Fabrice Di Meglio
5ea9b966d8 Merge "Fix bug #1776278 (consider supplying our own (unique) eid for calendar entries created on the device)" 2010-11-09 16:13:22 -08:00
David 'Digit' Turner
3aa9fe0526 Merge "Refresh EGL header to work with the NDK" into gingerbread 2010-11-09 16:12:06 -08:00
Scott Main
2e46be44d7 am fe8c4f7b: am a784d552: Merge "docs: add release notes for ADT v8" into gingerbread
* commit 'fe8c4f7bbad87fc387b8d8b79f5343055a1a1039':
  docs: add release notes for ADT v8
2010-11-09 15:58:24 -08:00
James Dong
e1f3b46715 Merge "Fix missing breaks in the profile/level conversion code in M4vH263 encoder" 2010-11-09 15:48:11 -08:00
Scott Main
fcc532c11b am a784d552: Merge "docs: add release notes for ADT v8" into gingerbread
* commit 'a784d5528f6fa07a48bb7de9dcfa04eb60044927':
  docs: add release notes for ADT v8
2010-11-09 15:34:46 -08:00
Scott Main
24a6729a25 Merge "docs: add release notes for ADT v8" into gingerbread 2010-11-09 15:29:22 -08:00
Amith Yamasani
5261199c6e Merge "Fix preference layouts so that custom preferences don't break." 2010-11-09 15:11:29 -08:00
Andreas Huber
792f3a75c9 Merge "Some refactoring and added support for another form of vbr headers." 2010-11-09 14:59:13 -08:00
Brad Fitzpatrick
7ca663369c Merge "Don't warn on reading from disk during initial class loading." 2010-11-09 14:52:15 -08:00
Mathias Agopian
744026fed6 DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions
We just make sure eglGetProcAddress() will return NULL for
 glEGLImageTargetTexture2DOES
 glEGLImageTargetRenderbufferStorageOES

which is better than returning the address of the wrong implementation.

the correct fix is more involved.

Change-Id: I585a1f40e564f862e5dd382224609ccd069cd3b5
2010-11-09 14:41:13 -08:00
Jason Sams
083f0fa400 Merge "Fix fountain bug with more than 10 touches reported." 2010-11-09 14:23:06 -08:00
Joe Onorato
92cd276cd9 Merge "fix the build. more string disambiguaiton." 2010-11-09 12:56:30 -08:00
Joe Onorato
07ac879a72 Merge "If the image wallpaper fails to load, including via an OutOfMemoryError because of a big bitmap, reset to the default." 2010-11-09 12:27:07 -08:00
James Dong
7957a060ab Merge "Rotation support" 2010-11-09 11:58:37 -08:00
Andreas Huber
eda787b4b6 Merge "Added a commandline option "-x" to the stagefright commandline tool." 2010-11-09 11:37:59 -08:00
Jesse Wilson
d23599d5f1 Merge "Update current.xml to be in sync with deprecated tags." 2010-11-09 11:34:20 -08:00
Huahui Wu
89dbcc94ef Merge "b/2864818 use authType for cert verification." 2010-11-09 11:31:26 -08:00
Jesse Wilson
52ac3a72ba am 2d2f10fa: am 28c74257: Add @Deprecated to match @deprecated where it\'s missing.
* commit '2d2f10fa3412adc07a08c25ba5d2df600fb654bf':
  Add @Deprecated to match @deprecated where it's missing.
2010-11-09 10:26:39 -08:00
Jesse Wilson
ca5bd68482 Merge "Test to demonstrate that HTTP cookie hostnames aren't case-sensitive." 2010-11-09 10:25:04 -08:00
Jesse Wilson
6f047ffffe am 28c74257: Add @Deprecated to match @deprecated where it\'s missing.
* commit '28c742573ccaeb55c16bc02fb25fdd86b8d1f76a':
  Add @Deprecated to match @deprecated where it's missing.
2010-11-09 10:17:33 -08:00
Scott Main
7886b68f61 am 86372ec4: am 9eb48bb2: Merge "docs: revisions to ndk release notes" into gingerbread
* commit '86372ec41c2ec23917fabff56b786edbb94e24d9':
  docs: revisions to ndk release notes
2010-11-09 09:43:51 -08:00
Gilles Debunne
5dc3845de0 Merge "Amended 9patch border documentation" 2010-11-09 09:36:38 -08:00
Scott Main
154a3d9e99 am 9eb48bb2: Merge "docs: revisions to ndk release notes" into gingerbread
* commit '9eb48bb2b1627ef8182d260f8b3fd080c57bed4d':
  docs: revisions to ndk release notes
2010-11-09 09:35:24 -08:00
Scott Main
2fcbe03d87 Merge "docs: revisions to ndk release notes" into gingerbread 2010-11-09 09:30:30 -08:00
Iain Merrick
161a2cb91e Merge "Include .php tests in DumpRenderTree2." 2010-11-09 08:15:33 -08:00
Chet Haase
60d790618f Merge "Fix GL rendering of translucent surfaces" 2010-11-09 07:14:23 -08:00
Jeff Hamilton
ff3d392949 am cc798d96: am 2e2983c6: Merge "Reduce log clutter." into gingerbread
* commit 'cc798d9675b105775c9736fc68b68d7c8cd0c5a7':
  Reduce log clutter.
2010-11-09 07:06:02 -08:00
Jeff Hamilton
20aaf81143 am 2e2983c6: Merge "Reduce log clutter." into gingerbread
* commit '2e2983c6efe0e4223086e4675b715ed0e20e8d26':
  Reduce log clutter.
2010-11-09 06:59:33 -08:00
Jeff Hamilton
b2973f20e8 Merge "Reduce log clutter." into gingerbread 2010-11-09 06:54:51 -08:00
Steve Block
eeb74ae7df Merge changes I650518a4,If15fddac
* changes:
  Fix DumpRenderTree2 to not attempt to read expected results over HTTPS
  Fix FsUtils.readDataFromUrl() to do the network request on a background thread
2010-11-09 06:32:13 -08:00
Wu-cheng Li
39c1bb1906 am 482083c5: (-s ours) am f6bd761f: Use back-facing camera as default in camera/camcorder profile.do not merge
* commit '482083c57fc21516099d4f9987512f649e362960':
  Use back-facing camera as default in camera/camcorder profile.do not merge
2010-11-09 00:02:44 -08:00
Wu-cheng Li
7912413abe Merge "Use back-facing camera as default in camera/camcorder profile." 2010-11-09 00:01:33 -08:00
Wu-cheng Li
ec8f8774e3 am f6bd761f: Use back-facing camera as default in camera/camcorder profile.do not merge
* commit 'f6bd761f9407a35cc1c4a4b9e199e6a0dc8e4943':
  Use back-facing camera as default in camera/camcorder profile.do not merge
2010-11-08 23:56:20 -08:00
Huahui Wu
c078919a35 Merge "Expose the cert validator to JNI." 2010-11-08 21:00:13 -08:00
James Dong
af29703a8f am 9cebb86c: am 1b2efbca: Merge "Update a comment about when setOrientationHint() should be called" into gingerbread
* commit '9cebb86c95ad4846ecc771e4b40d2dbd5cf1494b':
  Update a comment about when setOrientationHint() should be called
2010-11-08 20:43:10 -08:00
Adam Powell
7075cd3245 am 8bd41ac1: (-s ours) Merge "Fix typo in manual merge" into gingerbread-plus-aosp
* commit '8bd41ac175f8e254d67d31cf020932e4f02d00c5':
  Fix typo in manual merge
2010-11-08 20:43:03 -08:00