Commit Graph

15537 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
279f737e23 am d84509d5: am 05bcf755: am 2529d4ea: Adapt to new location of libcore 2010-05-02 16:17:23 -07:00
Jean-Baptiste Queru
996694e2f0 am 05bcf755: am 2529d4ea: Adapt to new location of libcore 2010-05-02 16:15:26 -07:00
Jean-Baptiste Queru
c95afe73fd am 2529d4ea: Adapt to new location of libcore
Merge commit '2529d4eab80778aef9c7a9fe27712a41686d22c4' into kraken

* commit '2529d4eab80778aef9c7a9fe27712a41686d22c4':
  Adapt to new location of libcore
2010-05-02 16:11:32 -07:00
Xia Wang
2bee58dbdc am 011056c2: am 7eb700e0: Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken 2010-04-30 15:51:41 -07:00
Xia Wang
f20b47880b am 7eb700e0: Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken 2010-04-30 15:50:25 -07:00
Xia Wang
e981b356e1 Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken 2010-04-30 15:49:23 -07:00
Jean-Baptiste Queru
0adef024b2 am 69d5a7ce: am 5b559e81: Adapt to new location of libcore 2010-04-30 15:08:57 -07:00
Mathias Agopian
4e448523e7 am 8f227c96: am 3b91e13e: make sure the server-side validates pointers/indices visible on the client side 2010-04-30 15:08:40 -07:00
Jean-Baptiste Queru
127f770a13 am 0d5ad0fb: Merge "Adapt to new location of libcore" into kraken-plus-aosp 2010-04-30 15:08:36 -07:00
Mathias Agopian
25a58efa19 am 1bb8b670: Merge "Add support for enqueuing buffers in arbitrary order" into kraken 2010-04-30 15:08:10 -07:00
Daniel Sandler
9da3b7247a am b205daba: am d47cdbb7: am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo 2010-04-30 15:07:37 -07:00
Jean-Baptiste Queru
257810f55b am 5b559e81: Adapt to new location of libcore 2010-04-30 13:20:48 -07:00
Mathias Agopian
067579650f am 3b91e13e: make sure the server-side validates pointers/indices visible on the client side 2010-04-30 13:08:41 -07:00
Mathias Agopian
d52128786f make sure the server-side validates pointers/indices visible on the client side
Change-Id: I604f58d3fcd2d09ec7998123c627401081345cd6
2010-04-30 13:05:36 -07:00
Jean-Baptiste Queru
0fc2f0a3de Merge "Adapt to new location of libcore" into kraken-plus-aosp 2010-04-30 13:05:18 -07:00
Mathias Agopian
30c4c182ec Merge "Add support for enqueuing buffers in arbitrary order" into kraken 2010-04-30 12:58:11 -07:00
Daniel Sandler
bfe2180f5c am d47cdbb7: am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo
Merge commit 'd47cdbb7ea97a6ed3b428d913fa45883904d0ba8' into kraken

* commit 'd47cdbb7ea97a6ed3b428d913fa45883904d0ba8':
  Tweak style of recent apps dialog title.
2010-04-30 11:34:03 -07:00
Daniel Sandler
ea4638de04 am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo
Merge commit '3bb5e4d322a6a7cda45e868dbe307c2dc3cf688e' into froyo-plus-aosp

* commit '3bb5e4d322a6a7cda45e868dbe307c2dc3cf688e':
  Tweak style of recent apps dialog title.
2010-04-30 11:30:29 -07:00
Daniel Sandler
70f124064f Merge "Tweak style of recent apps dialog title." into froyo 2010-04-30 10:55:03 -07:00
Scott Main
8b68d15956 am 5eb01a57: am 27963bbc: am cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo 2010-04-29 21:27:15 -07:00
Scott Main
3b97564b34 am 27963bbc: am cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo
Merge commit '27963bbc25278885f57965f6bf8250d6eeabd94a' into kraken

* commit '27963bbc25278885f57965f6bf8250d6eeabd94a':
  docs: editorial revisions to the bmgr tool doc
2010-04-29 21:24:25 -07:00
Scott Main
91916b0291 am cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo
Merge commit 'cd8f7bd4e50db9b5662572988a7dffdb6a4c4187' into froyo-plus-aosp

* commit 'cd8f7bd4e50db9b5662572988a7dffdb6a4c4187':
  docs: editorial revisions to the bmgr tool doc
2010-04-29 21:23:10 -07:00
Scott Main
878f4e537c Merge "docs: editorial revisions to the bmgr tool doc" into froyo 2010-04-29 21:22:17 -07:00
Dianne Hackborn
58a92020f4 am 1443fd09: Fix build. 2010-04-29 19:30:45 -07:00
Dianne Hackborn
e1024e46b9 am fefe7a22: Merge "Fix build." into kraken 2010-04-29 18:01:33 -07:00
Dianne Hackborn
f9a3108333 Merge "Fix build." into kraken 2010-04-29 17:59:17 -07:00
Dianne Hackborn
8d31248c66 am 867ab647: Integrate a bunch of stuff from Froyo: 2010-04-29 17:38:29 -07:00
Marc Blank
5bd58c11cd am 8abcce1f: am 9ca81664: am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo 2010-04-29 17:09:25 -07:00
Marc Blank
f472da17d6 am 9ca81664: am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
Merge commit '9ca816649bd2af7d540f375be8fcc503c50aef72' into kraken

* commit '9ca816649bd2af7d540f375be8fcc503c50aef72':
  Expose _id in ExtendedProperties subValues
2010-04-29 16:28:50 -07:00
Marc Blank
83a1c18b92 am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
Merge commit '794cd640bfa8c6d82803b59bc18cbd73627a8162' into froyo-plus-aosp

* commit '794cd640bfa8c6d82803b59bc18cbd73627a8162':
  Expose _id in ExtendedProperties subValues
2010-04-29 15:40:30 -07:00
Marc Blank
c8ba40f759 Merge "Expose _id in ExtendedProperties subValues" into froyo 2010-04-29 15:39:37 -07:00
Kenny Root
e25f211985 am 82b027e9: am 48399e38: am 77a1beb1: Merge "Import revised translations" into froyo 2010-04-29 15:34:36 -07:00
Kenny Root
69cb780bed am 48399e38: am 77a1beb1: Merge "Import revised translations" into froyo
Merge commit '48399e38c978a66ac4c6054c8681a246dfc94b4b' into kraken

* commit '48399e38c978a66ac4c6054c8681a246dfc94b4b':
  Import revised translations
2010-04-29 15:31:23 -07:00
Kenny Root
55c91f4369 am 77a1beb1: Merge "Import revised translations" into froyo
Merge commit '77a1beb137948ad45423bb8fcd7e424e36144133' into froyo-plus-aosp

* commit '77a1beb137948ad45423bb8fcd7e424e36144133':
  Import revised translations
2010-04-29 15:29:22 -07:00
Scott Main
6db4f2ccf5 am cd845f37: am 1d328033: am 764caf24: Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo 2010-04-29 15:28:42 -07:00
Kenny Root
f45bffd15c Merge "Import revised translations" into froyo 2010-04-29 15:28:15 -07:00
Scott Main
c8b70f2982 am 1d328033: am 764caf24: Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo
Merge commit '1d328033277aef352a80f06f3520a86cbdc9c48f' into kraken

* commit '1d328033277aef352a80f06f3520a86cbdc9c48f':
  docs: rewrite information about using shared preferences, internal and
2010-04-29 15:25:31 -07:00
Scott Main
eb912814d5 am 764caf24: Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo
Merge commit '764caf2481d935ce6870ec141f1e845178df8b47' into froyo-plus-aosp

* commit '764caf2481d935ce6870ec141f1e845178df8b47':
  docs: rewrite information about using shared preferences, internal and
2010-04-29 15:23:32 -07:00
Scott Main
94921632d8 Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo 2010-04-29 15:21:34 -07:00
Mathias Agopian
955450d604 am daedd81f: Merge "cleanup. waitForCondition() now uses polymorphsim instead of templtes" into kraken 2010-04-29 14:34:26 -07:00
Mathias Agopian
580115cb2f am 1d0fa397: Merge "fix a race condition in undoDequeue(), where \'tail\' could be computed incorrectly." into kraken 2010-04-29 14:34:21 -07:00
Mathias Agopian
4fcad80654 Merge "cleanup. waitForCondition() now uses polymorphsim instead of templtes" into kraken 2010-04-29 14:17:12 -07:00
Mathias Agopian
a228cc5efa Merge "fix a race condition in undoDequeue(), where 'tail' could be computed incorrectly." into kraken 2010-04-29 14:16:14 -07:00
Dianne Hackborn
67131a0419 am 9eef6311: am d8f34720: am c956f375: Fix issue #2641875: Apps on sdcard not accesible after update 2010-04-29 13:54:12 -07:00
Dianne Hackborn
b219882a21 am d8f34720: am c956f375: Fix issue #2641875: Apps on sdcard not accesible after update
Merge commit 'd8f34720a1eb87770c854928410c753e0969d3ac' into kraken

* commit 'd8f34720a1eb87770c854928410c753e0969d3ac':
  Fix issue #2641875: Apps on sdcard not accesible after update
2010-04-29 12:22:52 -07:00
Dianne Hackborn
08e115f8b8 am c956f375: Fix issue #2641875: Apps on sdcard not accesible after update
Merge commit 'c956f37567593a71271bae107eafec47575f7dcc' into froyo-plus-aosp

* commit 'c956f37567593a71271bae107eafec47575f7dcc':
  Fix issue #2641875: Apps on sdcard not accesible after update
2010-04-29 12:20:42 -07:00
Steve Block
da32d0818b Merge "Merge webkit.org at r55033 : Update the WebKit UA string and LayoutTest ignore list" 2010-04-29 03:27:29 -07:00
Adam Powell
18b543fc24 am 6bbb65e6: am 6483f6d5: am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early 2010-04-28 19:45:04 -07:00
Adam Powell
c5ba613c04 am 6483f6d5: am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early
Merge commit '6483f6d546655a9579670b42d445614cab609e28' into kraken

* commit '6483f6d546655a9579670b42d445614cab609e28':
  Fix bug 2639949 - Don't stop a Scroller early
2010-04-28 19:38:41 -07:00
Adam Powell
9ee392bf96 am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early
Merge commit 'b40c42f1ffa124cfbd5152007491c1d0b065592d' into froyo-plus-aosp

* commit 'b40c42f1ffa124cfbd5152007491c1d0b065592d':
  Fix bug 2639949 - Don't stop a Scroller early
2010-04-28 19:34:49 -07:00