ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
15,093 Commits 2 Branches 0 Tags 54 MiB
9085e649ac
Commit Graph

15093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
9085e649ac am ce0bd717: am 8ea45aad: am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo 2010-05-04 14:52:47 -07:00
Scott Main
d038dd3e92 am ebad36db: am 5c16039a: am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo 2010-05-04 14:52:43 -07:00
Andreas Huber
80637684aa am 8ea45aad: am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo 
Merge commit '8ea45aad100ee25067b2e83703454c71a968ba4f' into kraken

* commit '8ea45aad100ee25067b2e83703454c71a968ba4f':
  Support for Ogg Vorbis decoding in stagefright.
 2010-05-04 14:30:34 -07:00
Andreas Huber
e7f1b6dd9c am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo 
Merge commit 'e083d0a2f50906423ab548047d436c74648fc488' into froyo-plus-aosp

* commit 'e083d0a2f50906423ab548047d436c74648fc488':
  Support for Ogg Vorbis decoding in stagefright.
 2010-05-04 14:29:04 -07:00
Andreas Huber
fe8bcd9c8a Merge "Support for Ogg Vorbis decoding in stagefright." into froyo 2010-05-04 14:27:26 -07:00
Scott Main
c2e89d246e am 5c16039a: am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo 
Merge commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3' into kraken

* commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3':
  docs: revise and add documentation for backup APIs
 2010-05-04 14:22:47 -07:00
Scott Main
46016a24eb am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo 
Merge commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942' into froyo-plus-aosp

* commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942':
  docs: revise and add documentation for backup APIs
 2010-05-04 14:21:21 -07:00
Scott Main
69c8c1c8db Merge "docs: revise and add documentation for backup APIs" into froyo 2010-05-04 14:20:02 -07:00
Daniel Sandler
20d6ada4b5 am f24e66db: am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo 2010-05-04 12:55:03 -07:00
Dan Morrill
1021f0ecaf am 6a22fb9b: am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 2010-05-04 12:54:58 -07:00
Joe Onorato
e2c394f4f0 am 07779ac1: am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated. 2010-05-04 12:54:54 -07:00
Daniel Sandler
3adf5f2abf am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo 
Merge commit '342a3800b9b31929b337d298a24184d820f27f26' into kraken

* commit '342a3800b9b31929b337d298a24184d820f27f26':
  Increase the row height of menus by 1dip.
 2010-05-04 12:45:53 -07:00
Dan Morrill
2243017061 am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 
Merge commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken

* commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9':
  Adding the backward-compatible filtering heuristics for the new device
 2010-05-04 12:45:49 -07:00
Joe Onorato
25ab836708 am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated. 
Merge commit '77da7312215c4a433e3f53c2fe306307fc3bad52' into kraken

* commit '77da7312215c4a433e3f53c2fe306307fc3bad52':
  Call into app widget hosts when the provider is updated.
 2010-05-04 12:45:44 -07:00
Daniel Sandler
f27cbc7bed am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo 
Merge commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502' into froyo-plus-aosp

* commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502':
  Increase the row height of menus by 1dip.
 2010-05-04 12:42:48 -07:00
Daniel Sandler
2da986fbd2 Merge "Increase the row height of menus by 1dip." into froyo 2010-05-04 12:40:54 -07:00
Dan Morrill
34910b3d28 am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 
Merge commit 'e17b4e711571198f79c0c2bad3656d58c63629e8' into froyo-plus-aosp

* commit 'e17b4e711571198f79c0c2bad3656d58c63629e8':
  Adding the backward-compatible filtering heuristics for the new device
 2010-05-04 12:38:03 -07:00
Joe Onorato
906a59288c am f140be6c: Call into app widget hosts when the provider is updated. 
Merge commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04' into froyo-plus-aosp

* commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04':
  Call into app widget hosts when the provider is updated.
 2010-05-04 12:37:59 -07:00
Dan Morrill
515eb68646 Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 2010-05-04 12:03:45 -07:00
The Android Open Source Project
31e7033c12 am e4b9834f: am 6de3a6fd: merge from open-source master 2010-05-04 09:29:27 -07:00
The Android Open Source Project
61aee0c845 am 6de3a6fd: merge from open-source master 
Merge commit '6de3a6fdd303b15ad944570daf37faa798dc1989' into kraken

* commit '6de3a6fdd303b15ad944570daf37faa798dc1989':
  Fix typo of <p> end tag in appwidgets.xml
 2010-05-04 09:27:35 -07:00
The Android Open Source Project
00ad0d2d5c merge from open-source master 
Change-Id: I5f552b45caae639170674213c23f154437b58afd
 2010-05-04 09:20:16 -07:00
The Android Open Source Project
fd9abb8086 am dcb5f18f: am 007ad770: merge from open-source master 2010-05-03 16:26:53 -07:00
Romain Guy
a4b249c12f Merge "Fix typo of <p> end tag in appwidgets.xml" 2010-05-03 16:25:34 -07:00
The Android Open Source Project
439dcb36ed am 007ad770: merge from open-source master 
Merge commit '007ad7700a23ff7e618cfeee1eab97063c93b800' into kraken

* commit '007ad7700a23ff7e618cfeee1eab97063c93b800':
  Adapt to new location of libcore
  Parse custom text header and ignore it.
  Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
  'uses-library' was not working for persistent applications.
  Fix an NPE in InputMethodService when mExtractAction is null.
 2010-05-03 16:25:15 -07:00
The Android Open Source Project
0fb44af855 merge from open-source master 
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
 2010-05-03 16:19:31 -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
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
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
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
f9a3108333 Merge "Fix build." into kraken 2010-04-29 17:59:17 -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
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
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