Commit Graph

30175 Commits

Author SHA1 Message Date
Dirk Dougherty
2d44573064 am e05bd9ee: am 0e40519b: Merge "Doc change: add diff report for API 11" into honeycomb
* commit 'e05bd9ee7f800ca4350a8c8b94bcfdab1f9e8217':
  Doc change: add diff report for API 11
2011-02-09 15:25:28 -08:00
Dirk Dougherty
257497d912 am 0e40519b: Merge "Doc change: add diff report for API 11" into honeycomb
* commit '0e40519beefe3d2ea0870a8eecac1a58f1fb6403':
  Doc change: add diff report for API 11
2011-02-09 15:21:49 -08:00
Dirk Dougherty
4917dbf6a5 Merge "Doc change: add diff report for API 11" into honeycomb 2011-02-09 15:19:08 -08:00
Dirk Dougherty
2dd3fe8584 am e1109753: am fefa95a9: Doc change: Add version notes for Android 2.3.3.
* commit 'e110975368a26637793db7079d1ba6c4a2806056':
  Doc change: Add version notes for Android 2.3.3.
2011-02-09 14:23:00 -08:00
Dirk Dougherty
094217876b am fefa95a9: Doc change: Add version notes for Android 2.3.3.
* commit 'fefa95a9c828d2b67227894b7ee3979504c0f52a':
  Doc change: Add version notes for Android 2.3.3.
2011-02-09 14:20:06 -08:00
James Dong
4ff57c79f8 Merge "Catch read error from AudioRecord and do not assert" 2011-02-09 13:58:06 -08:00
Vasu Nori
fd26125ce7 Merge "turn off sqlite WAL until bugs bug:3024421 and bug:3353077 are fixed" 2011-02-09 13:34:43 -08:00
Mathias Agopian
e28fe54e7a am bfe9e9cf: am cc24170d: Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb
* commit 'bfe9e9cf18ca84214bc59d875d74ca63a27e2414':
  fix [3374821] Cannot take screenshot of HC preview
2011-02-09 13:27:01 -08:00
Mathias Agopian
42ebf195b2 am cc24170d: Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb
* commit 'cc24170dc653ea5fc9fe7b9b8c596700c4d6dc99':
  fix [3374821] Cannot take screenshot of HC preview
2011-02-09 13:22:46 -08:00
Mathias Agopian
5d90264a79 Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb 2011-02-09 13:18:53 -08:00
Glenn Kasten
686bb3f6a4 Merge "Bug 3438513 Fix incorrect throws clause" 2011-02-09 13:08:00 -08:00
Dirk Dougherty
94f6064919 am bf5cde2f: am be04bfd0: am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
* commit 'bf5cde2f7112b53e5b237e7275267caef25c789d':
  Doc change: Add diff report for api 10.
2011-02-09 12:22:26 -08:00
Gilles Debunne
9256ea6339 am 54afc818: am 63bd55c7: am cdfe8999: Fix for multiple merge problem.
* commit '54afc818afa2d3ffe525e35ecdfc421c6fa862f3':
  Fix for multiple merge problem.
2011-02-09 12:22:23 -08:00
Dirk Dougherty
93457e74e9 am be04bfd0: am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
* commit 'be04bfd09914bbabf715959170c32030072b65f4':
  Doc change: Add diff report for api 10.
2011-02-09 12:19:54 -08:00
Gilles Debunne
78fd484d9b am 63bd55c7: am cdfe8999: Fix for multiple merge problem.
* commit '63bd55c7bf6f5d9384ad25637a4f4a7d2ef8d441':
  Fix for multiple merge problem.
2011-02-09 12:19:46 -08:00
Svetoslav Ganov
31474719f7 Merge "Added tests for WebView accessibility no JS" 2011-02-09 11:14:43 -08:00
Eric Fischer
6f851b003f am c3e3cc3d: (-s ours) am ebcbde6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit 'c3e3cc3dee2a6a20fabbf98496ae1d9ddedc897c':
  Import revised translations.  DO NOT MERGE
2011-02-09 10:52:11 -08:00
Eric Fischer
b14ac99db7 am ebcbde6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit 'ebcbde6a6e5a8da947a3f28eba7207256b891fdd':
  Import revised translations.  DO NOT MERGE
2011-02-09 10:47:47 -08:00
Eric Fischer
aa9484720d Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-09 10:11:18 -08:00
Daniel Sandler
03432ed9e3 Merge "Bringing back the pocket." 2011-02-09 06:19:58 -08:00
Vasu Nori
531ef77165 Merge "bug:3435895 change a couple of retryable error constants to < 400" 2011-02-08 22:01:39 -08:00
Gilles Debunne
b30d5f824a am 4fd30641: Merge "resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '4fd30641a9a82ae3bfbc59473e8ea4e9691a7c39':
  Double tap triggers text selection in a TextView. DO NOT MERGE
2011-02-08 20:41:35 -08:00
Gilles Debunne
82f05a1673 Merge "resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-02-08 20:38:59 -08:00
Gilles Debunne
c1b753b09b resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp
Change-Id: I59886953b76857ab0a089947e1c5335b93f68d5e
2011-02-08 20:36:04 -08:00
Mike Lockwood
6e68e816b8 Merge "MTP: Fix NPE in MtpPropertyGroup" 2011-02-08 19:00:32 -08:00
Scott Main
63e0464f59 am 5988355a: am 3f41d8f5: docs: fix a couple titles
* commit '5988355af4635094a99e408ce4199e9d19af6f9e':
  docs: fix a couple titles
2011-02-08 18:51:32 -08:00
Scott Main
0461cb7364 am 3f41d8f5: docs: fix a couple titles
* commit '3f41d8f5ee1a8d5366d79ee03d97fac8403c676a':
  docs: fix a couple titles
2011-02-08 18:48:53 -08:00
Scott Main
3715bfc8c9 am 2b7aec46: am f002b675: Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb
* commit '2b7aec46639ffb3242eb1ac6d557c87e68442438':
  docs: shorten and revise some titles in the Developing docs and resolve respective links
2011-02-08 18:42:01 -08:00
Scott Main
497b81b7eb am f002b675: Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb
* commit 'f002b6752562a442c934bdf7c04cb0fedc24d442':
  docs: shorten and revise some titles in the Developing docs and resolve respective links
2011-02-08 18:39:24 -08:00
Scott Main
b7e4dc39a1 Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb 2011-02-08 18:36:04 -08:00
Dmitri Plotnikov
493dd2ab3d Merge "Full text search: new API, deprecating old API." 2011-02-08 18:14:40 -08:00
Dirk Dougherty
1e6e960d66 am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
* commit '01967c0ee104e985167374e41f2c416c1100f767':
  Doc change: Add diff report for api 10.
2011-02-08 17:31:54 -08:00
Gilles Debunne
2f630a5533 am cdfe8999: Fix for multiple merge problem.
* commit 'cdfe899991c365d9e197d83f8859089cae082011':
  Fix for multiple merge problem.
2011-02-08 17:31:33 -08:00
Christopher Tate
d2033a3d6d Merge "Align inexact alarms in both time bases; don't pull to wall time" 2011-02-08 17:15:37 -08:00
Joe Malin
f1143ffa0f am 9087566b: am 7777fb04: Merge "DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc" into honeycomb
* commit '9087566bf1d6b2b7d7a0d3112732113400f6ec47':
  DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc
2011-02-08 17:01:35 -08:00
Joe Malin
9b587ca015 am 7777fb04: Merge "DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc" into honeycomb
* commit '7777fb04f1bdb11628ef8978c42b14e51ebb9c56':
  DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc
2011-02-08 16:58:22 -08:00
Joe Malin
668192f6c3 Merge "DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc" into honeycomb 2011-02-08 16:55:53 -08:00
Gilles Debunne
a8b288d285 resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
2011-02-08 16:33:58 -08:00
Adam Powell
408f3da336 Merge "Fix bug 3345948 - ActionBar.show()/hide() shouldn't animate if called before first layout" 2011-02-08 16:32:54 -08:00
James Dong
03b18c87d9 Merge "Should reset errno to 0 before calling strtoll()." 2011-02-08 16:07:42 -08:00
Andy McFadden
27c3536fac Merge "Use JNI helper function to get buffer address" 2011-02-08 16:03:24 -08:00
Scott Main
7219c76d96 am 91c1b185: am b70afd34: docs: remove and correct parent links for fundamental docs and hide the "beginner\'s path" because it\'s not complete
* commit '91c1b18533078e543c40d6937dea9c4ed2171565':
  docs: remove and correct parent links for fundamental docs and hide the "beginner's path" because it's not complete
2011-02-08 15:06:57 -08:00
Scott Main
ae756b285d am 3c565377: am b508d6e2: Merge "docs: fix links to revised fundamentals documents" into honeycomb
* commit '3c5653773d6b48f27aa52d746a7a6f8728d5ba36':
  docs: fix links to revised fundamentals documents
2011-02-08 15:06:54 -08:00
Jason Sams
64a5aae44d am e2b2a02a: am 4fd70373: Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb
* commit 'e2b2a02a91dc4101a9481b5bb6ba4c56c7a35dd7':
  Fix bug 3421901 remove 2 functions from public headers in the SDK.
2011-02-08 15:06:50 -08:00
Dirk Dougherty
5db8215967 am 81f4f8d0: am 50b7d70f: Merge "Cherrypick from gb: Doc change: Add diff report for api 10." into honeycomb
* commit '81f4f8d0f9edf285ec371c58ec1053cc6e1ed856':
  Cherrypick from gb: Doc change: Add diff report for api 10.
2011-02-08 15:06:46 -08:00
Xavier Ducrohet
22dde146ea am 024bbea2: am dc3fc3dc: Merge "LayoutLib: fix the background of title/action bars." into honeycomb
* commit '024bbea2155dc37df87b337007a887029f9d1cab':
  LayoutLib: fix the background of title/action bars.
2011-02-08 15:06:38 -08:00
Dmitry Shmidt
efdcccbb64 Merge "Parse the rssi result string in case-insensitive manner. This matches similar code in wpa-supplicant, driver_wext.c" 2011-02-08 14:58:18 -08:00
Scott Main
22a9ed6105 am b70afd34: docs: remove and correct parent links for fundamental docs and hide the "beginner\'s path" because it\'s not complete
* commit 'b70afd342b658d23518e0fa69aff9e45ec01e222':
  docs: remove and correct parent links for fundamental docs and hide the "beginner's path" because it's not complete
2011-02-08 14:57:50 -08:00
Scott Main
cc71ecc39d am b508d6e2: Merge "docs: fix links to revised fundamentals documents" into honeycomb
* commit 'b508d6e26e3a1fd68bf637dc29df335f0e7ccd92':
  docs: fix links to revised fundamentals documents
2011-02-08 14:57:45 -08:00
Jason Sams
5ec57f6012 am 4fd70373: Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb
* commit '4fd70373ecafbf5a87a1c35852aec2818612e928':
  Fix bug 3421901 remove 2 functions from public headers in the SDK.
2011-02-08 14:57:35 -08:00