summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | add video/audio chat-compatibility modes to ContactsContractVasu Nori2010-07-172-0/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic0b04017ad4216f1a1c5f07fa9d27e6970ded931
* | | | | | | | | | Make View transforms work again.Romain Guy2010-07-172-37/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I42aa8b5a55d7584ed242e1cb1f7123a6354edbc8
* | | | | | | | | | am 2b381aff: am 2c87e9c9: First submission of audio effect library from NXP ↵Eric Laurent2010-07-17203-65/+29801
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | software. Merge commit '2b381affda94c5b17e023768f9f2271c69152838' * commit '2b381affda94c5b17e023768f9f2271c69152838': First submission of audio effect library from NXP software.
| * | | | | | | | | am 2c87e9c9: First submission of audio effect library from NXP software.Eric Laurent2010-07-17203-65/+29801
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2c87e9c923b0362fabf8c97ff63997542394c428' into gingerbread-plus-aosp * commit '2c87e9c923b0362fabf8c97ff63997542394c428': First submission of audio effect library from NXP software.
| | * | | | | | | | First submission of audio effect library from NXP software.Eric Laurent2010-07-17203-65/+29801
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL contains the first open sourceable version of the audio effect library from NXP software. The effects implemented are: - Bass boost - Virtualizer (stereo widening) - Equalizer - Spectrum analyzer Source file for the effect engines are located under libeffects/lvm/lib The wrapper implementing the interface with the audio effect framework in under libeffects/lvm/wrapper The code of other effect libraries has also been reorganized fo clarity: - the effect factory is now under libeffects/factory - the test equalizer and reverb effects are under libeffect/testlibs - the visualizer is under libeffects/virtualizer Change-Id: I8d91e2181f81b89f8fc0c1e1e6bf552c5809b2eb
* | | | | | | | | Fix bug 2845609 - Touch event dispatching problem.Adam Powell2010-07-172-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maintain the state of the CANCEL_NEXT_UP_EVENT flag properly. Change-Id: I5ca22409bf8557c486d02806811b10550c5576eb
* | | | | | | | | Merge "Add program for linear gradient."Romain Guy2010-07-169-9/+114
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add program for linear gradient.Romain Guy2010-07-169-9/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new DrawLinearGradientProgram class to enable the drawing of linear gradients. Two new vertex and fragment shaders are introduced, based on DrawTextureProgram's shaders. Change-Id: I885afc076bb6cef8cd3962ae21a086fa6a03bf96
* | | | | | | | | | Merge "Fix emulator dns."Robert Greenwalt2010-07-161-10/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix emulator dns.Robert Greenwalt2010-07-161-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Really fix it this time. The previous fix had a flaw which tested ok but was removed after a code review. This flaw masked problems in DataConnection, which this fix fixes. bug:2849192 Change-Id: I50d2dd827d4427f8030c0f590c85672869b509ff
* | | | | | | | | | | am 3994396b: am d3616592: Fix trackball down and movement bugs.Jeff Brown2010-07-162-1/+15
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3994396b089c36f432a7af5d542ef594142dd09b' * commit '3994396b089c36f432a7af5d542ef594142dd09b': Fix trackball down and movement bugs.
| * | | | | | | | | | am d3616592: Fix trackball down and movement bugs.Jeff Brown2010-07-162-1/+15
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd3616592fe1b315b589766c4b74ce728fc4968f5' into gingerbread-plus-aosp * commit 'd3616592fe1b315b589766c4b74ce728fc4968f5': Fix trackball down and movement bugs.
| | * | | | | | | | | Fix trackball down and movement bugs.Jeff Brown2010-07-162-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2823788 Change-Id: Icb0c392b58f7e735614460b5eb87439cb73ac4f2
* | | | | | | | | | | Merge "Fixing view property invalidation issues"Chet Haase2010-07-161-63/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixing view property invalidation issuesChet Haase2010-07-161-63/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I51d2c03cabacfc1a7c05073977e7c22d32de7cb3
* | | | | | | | | | | | Merge "Add plumbing to support gradients in OpenGL renderer."Romain Guy2010-07-167-37/+161
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Add plumbing to support gradients in OpenGL renderer.Romain Guy2010-07-167-37/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LinearGradient class keeps a copy of the various parameters that define the gradient. The copies are native arrays to avoid copying Java arrays on every draw call. The gradient code path is implemented until OpenGLRenderer::drawRect() (see TODO.) The actual gradient implementation will be added in a latter change. Change-Id: I9300d250ef5e2e9c2e097c3116ee71dfc9d752d8
* | | | | | | | | | | | am e2fb11b9: am ace999b0: Ignore attempts to finish events on unregistered ↵Jeff Brown2010-07-161-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | channels. Merge commit 'e2fb11b9b02518126ace1a998ae7f824fc76068a' * commit 'e2fb11b9b02518126ace1a998ae7f824fc76068a': Ignore attempts to finish events on unregistered channels.
| * | | | | | | | | | | am ace999b0: Ignore attempts to finish events on unregistered channels.Jeff Brown2010-07-161-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ace999b096739d376d4845c0ba94599197ff8477' into gingerbread-plus-aosp * commit 'ace999b096739d376d4845c0ba94599197ff8477': Ignore attempts to finish events on unregistered channels.
| | * | | | | | | | | | Ignore attempts to finish events on unregistered channels.Jeff Brown2010-07-161-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a common race that happens during application shutdown where the window may be removed before the input event is finished. The input dispatcher already recovers from this condition gracefully so there are no benefits to throwing an exception on the client side. Bug: 2834068 Change-Id: I53dcc3230464d7f528ac8a1cc9f01b5bb642f428
* | | | | | | | | | | | am d652751d: am b6761e73: am 28fe43be: Merge "Add the hook which can set the ↵Hung Dang2010-07-161-0/+43
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo Merge commit 'd652751de782bac7e37916ed5786fcfa637a2be3' * commit 'd652751de782bac7e37916ed5786fcfa637a2be3': Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
| * | | | | | | | | | | am b6761e73: am 28fe43be: Merge "Add the hook which can set the device to ↵Hung Dang2010-07-161-0/+43
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connect to wifi and in airplane mode after reboot. This is for the power test." into froyo Merge commit 'b6761e73ce6b255cfe96bfa1fa6ac611abcfc067' into gingerbread-plus-aosp * commit 'b6761e73ce6b255cfe96bfa1fa6ac611abcfc067': Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
| | * | | | | | | | | | am 28fe43be: Merge "Add the hook which can set the device to connect to wifi ↵Hung Dang2010-07-161-0/+43
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and in airplane mode after reboot. This is for the power test." into froyo Merge commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2' into gingerbread * commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2': Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
| | | * \ \ \ \ \ \ \ \ \ Merge "Add the hook which can set the device to connect to wifi and in ↵Hung Dang2010-07-161-0/+43
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | airplane mode after reboot. This is for the power test." into froyo
| | | | * | | | | | | | | | Add the hook which can set the device to connect to wifi and in airplane ↵Yu Shan Emily Lau2010-07-161-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode after reboot. This is for the power test. Change-Id: I42527612764252d1c47bd29a2b88d5e3019cfdf9
* | | | | | | | | | | | | | am 04b95313: am c8c79a65: Merge "Re-use existing Surface objects when ↵Jamie Gennis2010-07-163-13/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reading them from parcels." into gingerbread Merge commit '04b953132edb5482f0aa6d992f89e7016961528c' * commit '04b953132edb5482f0aa6d992f89e7016961528c': Re-use existing Surface objects when reading them from parcels.
| * | | | | | | | | | | | | am c8c79a65: Merge "Re-use existing Surface objects when reading them from ↵Jamie Gennis2010-07-163-13/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parcels." into gingerbread Merge commit 'c8c79a654d4ae8e3a883854e19cc2df757f72d82' into gingerbread-plus-aosp * commit 'c8c79a654d4ae8e3a883854e19cc2df757f72d82': Re-use existing Surface objects when reading them from parcels.
| | * | | | | | | | | | | | Merge "Re-use existing Surface objects when reading them from parcels." into ↵Jamie Gennis2010-07-163-13/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | | | | | | | | | Re-use existing Surface objects when reading them from parcels.Jamie Gennis2010-07-163-13/+38
| | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a process-global cache of previously deserialized Surface objects so that if a Surface object wrapping the same ISurface gets received again the same Surface can be used. This is important because the 'tail' pointer in the SharedBufferClient is stored only on the client side, and needs to be the same for all the Surface objects wrapping an ISurface instance. This solves the problem by making there only be one Surface object wrapping an ISurface per process. Change-Id: I4bf0b8787885c56277622fca053022d2bb638902
* | | | | | | | | | | | | | am 7b8df313: am 00ba8844: Fix individual pointer id up/down reporting.Jeff Brown2010-07-163-13/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7b8df313f714d6e8d536e0f8bbe5496fe9a6c26d' * commit '7b8df313f714d6e8d536e0f8bbe5496fe9a6c26d': Fix individual pointer id up/down reporting.
| * | | | | | | | | | | | | am 00ba8844: Fix individual pointer id up/down reporting.Jeff Brown2010-07-163-13/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '00ba884436dc8b222ad850c73c936d87bf4e84de' into gingerbread-plus-aosp * commit '00ba884436dc8b222ad850c73c936d87bf4e84de': Fix individual pointer id up/down reporting.
| | * | | | | | | | | | | | Fix individual pointer id up/down reporting.Jeff Brown2010-07-163-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a minor threading bug in InputManager dump. Change-Id: Ic2eecf7df5a8dc9f40561fcb03ebe58a2c073778
* | | | | | | | | | | | | | am aba4bf19: am e068b464: am 2a8dd4e4: Merge "docs: editorial revisions to ↵Scott Main2010-07-165-763/+874
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search guide" into froyo Merge commit 'aba4bf19fbdedb2f4f438895e8165a3b34a15633' * commit 'aba4bf19fbdedb2f4f438895e8165a3b34a15633': docs: editorial revisions to Search guide
| * | | | | | | | | | | | | am e068b464: am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" ↵Scott Main2010-07-165-763/+874
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit 'e068b46408f3ff390b47dc78ccf10fab76883051' into gingerbread-plus-aosp * commit 'e068b46408f3ff390b47dc78ccf10fab76883051': docs: editorial revisions to Search guide
| | * | | | | | | | | | | | am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyoScott Main2010-07-165-763/+874
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| / / / / / / / / / / | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1' into gingerbread * commit '2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1': docs: editorial revisions to Search guide
| | | * | | | | | | | | | Merge "docs: editorial revisions to Search guide" into froyoScott Main2010-07-165-763/+874
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | docs: editorial revisions to Search guideScott Main2010-07-165-763/+874
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a2065304d1d80c46f3bb3c658ab55f1fe58b211
* | | | | | | | | | | | | | Merge "Fix build."Jean-Baptiste Queru2010-07-161-6/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix build.Jean-Baptiste Queru2010-07-161-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to using public APIs instead of private ones. Change-Id: Ia3468d94b3dadeb6a000ce419ee08f7e7ba5dc67
* | | | | | | | | | | | | | | Merge "Optimize textures binding."Romain Guy2010-07-164-7/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | / / / / / / / / | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Optimize textures binding.Romain Guy2010-07-164-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The renderer is still changing textures' wrap modes every time, this will require a latter optimization. Change-Id: I3eb92cb8c886c4a692b7f0ca759911f9371d4d2c
* | | | | | | | | | | | | | Merge "Improve clip support (add intersect, union and replace.)"Romain Guy2010-07-169-87/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Improve clip support (add intersect, union and replace.)Romain Guy2010-07-169-87/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also modifies the way the clip is stored. The clip is now always stored in screen-space coordinates. Change-Id: I96375784d82dfe975bc6477a159e6866e7052487
* | | | | | | | | | | | | | am 5adfe6c5: merge from open-source masterThe Android Open Source Project2010-07-161-38/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f' * commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f': Fix the problem that color drawable cache key conflicts another drawable one.
| * | | | | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-07-161-38/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iacd42b06fa01fa6dfd18b81f07ce4b6da922dfff
| | * | | | | | | | | | | | Merge "Fix the problem that color drawable cache key conflicts another ↵Romain Guy2010-07-151-38/+69
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawable one. The cache key of a color drawable resource may be the same as another drawable resource's value."
| | | * | | | | | | | | | | | Fix the problem that color drawable cache key conflicts another drawable one.Masanori Ogino2010-07-161-38/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cache key of a color drawable resource may be the same as another drawable resource's value. Change-Id: Ia971bb242ceac5e8f9346094009a10f356399ab9 (Reduced duplicated codes and replace TAB to white spaces) And try to fix compile error.
* | | | | | | | | | | | | | | am c9ecd445: merge from open-source masterThe Android Open Source Project2010-07-163-0/+174
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c9ecd445b86552265b4adb90e5df2fbe5f71cb8e' * commit 'c9ecd445b86552265b4adb90e5df2fbe5f71cb8e': Added method getPreferredHttpHost
| * | | | | | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-07-163-0/+174
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6bdeeff30be1fdb0901aec9bcdd67176c29eaf7b
| | * | | | | | | | | | | | | Merge "Added method getPreferredHttpHost"Romain Guy2010-07-153-0/+174
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-02-10 20:24:33 +0000