| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | | | am efebdf4b: (-s ours) DO NOT MERGE: Support non-multiple-of-16 dimensions in... | Andreas Huber | 2011-01-29 | 0 | -0/+0 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software d... | Andreas Huber | 2011-01-24 | 3 | -9/+23 |
* | | | | | | am 28c4f69a: Updated checkbox assets | Justin Ho | 2011-01-29 | 0 | -0/+0 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Updated checkbox assets | Justin Ho | 2011-01-24 | 20 | -0/+0 |
| | |_|_|/
| |/| | | |
|
* | | | | | am 5e81a6e2: Fix trace mismatch. | Arnaud Ferir | 2011-01-29 | 1 | -1/+1 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Fix trace mismatch. | Arnaud Ferir | 2011-01-24 | 1 | -1/+1 |
* | | | | | am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel. | Sylvain Fonteneau | 2011-01-29 | 1 | -2/+16 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Handle mock tags in android.nfc.Tag conversion to Parcel. | Sylvain Fonteneau | 2011-01-24 | 1 | -2/+16 |
* | | | | | am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into ging... | John Wang | 2011-01-29 | 1 | -18/+56 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge "Enable recovery in RIL wakelock release check." into gingerbread | John Wang | 2011-01-24 | 1 | -18/+56 |
| |\ \ \ \
| | |_|_|/
| |/| | | |
|
| | * | | | Enable recovery in RIL wakelock release check. | John Wang | 2011-01-21 | 1 | -18/+56 |
* | | | | | Merge c896d85c from gingerbread | Jean-Baptiste Queru | 2011-01-29 | 2 | -12/+23 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge "Add operands to mifare classic increment, decrement." into gingerbread | Nick Pelly | 2011-01-23 | 2 | -12/+23 |
| |\ \ \ \ |
|
| | * | | | | Add operands to mifare classic increment, decrement. | Nick Pelly | 2011-01-23 | 2 | -12/+23 |
* | | | | | | Merge da01b4ab from gingerbread | Jean-Baptiste Queru | 2011-01-29 | 2 | -270/+229 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Merge "Make MifareClassic methods more consistent." into gingerbread | Nick Pelly | 2011-01-23 | 2 | -270/+229 |
| |\ \ \ \ \
| | |/ / / / |
|
| | * | | | | Make MifareClassic methods more consistent. | Nick Pelly | 2011-01-23 | 2 | -270/+229 |
* | | | | | | am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catc... | Jeff Hamilton | 2011-01-29 | 1 | -5/+11 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Merge "Allow null filters for foreground dispatch to act as catch all." into ... | Jeff Hamilton | 2011-01-23 | 1 | -5/+11 |
| |\ \ \ \ \ |
|
| | * | | | | | Allow null filters for foreground dispatch to act as catch all. | Jeff Hamilton | 2011-01-23 | 1 | -5/+11 |
* | | | | | | | am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM. | Jim Miller | 2011-01-29 | 1 | -2/+10 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|
| * | | | | | | Fix 3379239: Catch exceptions from workaround for OOM. | Jim Miller | 2011-01-23 | 1 | -2/+10 |
| |/ / / / / |
|
* | | | | | | am 1c9761e3: (-s ours) Merge "Do Not Merge Connect other profiles when priori... | Jaikumar Ganesh | 2011-01-28 | 0 | -0/+0 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Merge "Do Not Merge Connect other profiles when priority is auto connect." in... | Jaikumar Ganesh | 2011-01-21 | 1 | -5/+9 |
| |\ \ \ \ \
| | |_|/ / /
| |/| | | | |
|
| | * | | | | Do Not Merge Connect other profiles when priority is auto connect. | Jaikumar Ganesh | 2011-01-21 | 1 | -5/+9 |
* | | | | | | am 398a589c: (-s ours) Merge "DO NOT MERGE - Create db path if it doesn\'t ex... | John Reck | 2011-01-28 | 0 | -0/+0 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Merge "DO NOT MERGE - Create db path if it doesn't exit" into gingerbread | John Reck | 2011-01-21 | 1 | -3/+7 |
| |\ \ \ \ \
| | |_|/ / /
| |/| | | | |
|
| | * | | | | DO NOT MERGE - Create db path if it doesn't exit | John Reck | 2011-01-21 | 1 | -3/+7 |
* | | | | | | resolved conflicts for merge of dc54a8c7 to honeycomb-merge | Jeff Hamilton | 2011-01-28 | 15 | -297/+381 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Merge "API changes for NFC." into gingerbread | Jeff Hamilton | 2011-01-21 | 15 | -297/+381 |
| |\ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| | * | | | | API changes for NFC. | Jeff Hamilton | 2011-01-21 | 15 | -297/+381 |
* | | | | | | am a314f32b: (-s ours) Merge "Bug 3365937 notify TTS initialization listener ... | Jean-Michel Trivi | 2011-01-28 | 0 | -0/+0 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Merge "Bug 3365937 notify TTS initialization listener of binding errors" into... | Jean-Michel Trivi | 2011-01-21 | 1 | -5/+16 |
| |\ \ \ \ \ |
|
| | * | | | | | Bug 3365937 notify TTS initialization listener of binding errors | Jean-Michel Trivi | 2011-01-20 | 1 | -5/+16 |
* | | | | | | | resolved conflicts for merge of a314f32b to honeycomb-merge | Jeff Hamilton | 2011-01-28 | 1 | -6/+17 |
* | | | | | | | am c5694ebd: (-s ours) Merge "do not merge - Fix issue 3371096." into gingerb... | Eric Laurent | 2011-01-27 | 0 | -0/+0 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|
| * | | | | | | Merge "do not merge - Fix issue 3371096." into gingerbread | Eric Laurent | 2011-01-20 | 1 | -8/+10 |
| |\ \ \ \ \ \
| | |_|/ / / /
| |/| | | | | |
|
| | * | | | | | do not merge - Fix issue 3371096. | Eric Laurent | 2011-01-20 | 1 | -8/+10 |
* | | | | | | | am 11576102: (-s ours) Fix issue #3373438: Update GBMR versions | Dianne Hackborn | 2011-01-27 | 0 | -0/+0 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|
| * | | | | | | Fix issue #3373438: Update GBMR versions | Dianne Hackborn | 2011-01-20 | 2 | -1/+17 |
| |/ / / / / |
|
* | | | | | | am 65d39eeb: (-s ours) Merge "DO NOT MERGE: Prefill the cache before trying t... | Dave Sparks | 2011-01-27 | 0 | -0/+0 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media... | Dave Sparks | 2011-01-19 | 2 | -3/+31 |
| |\ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| | * | | | | DO NOT MERGE: Prefill the cache before trying to instantiate the media extrac... | Andreas Huber | 2011-01-19 | 2 | -3/+31 |
* | | | | | | am 822d4ce6: Merge "fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and... | Mathias Agopian | 2011-01-27 | 0 | -0/+0 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Merge "fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs... | Mathias Agopian | 2011-01-19 | 2 | -4/+4 |
| |\ \ \ \ \ |
|
| | * | | | | | fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when r... | Mathias Agopian | 2011-01-19 | 2 | -4/+4 |
| | |/ / / / |
|
* | | | | | | am d0725eef: (-s ours) Merge "Never drag scroll views with no children. (DO N... | Jeff Brown | 2011-01-27 | 0 | -0/+0 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerb... | Jeff Brown | 2011-01-19 | 2 | -7/+11 |
| |\ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| | * | | | | Never drag scroll views with no children. (DO NOT MERGE) | Jeff Brown | 2011-01-19 | 2 | -7/+11 |
* | | | | | | am a0bafb47: Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into ginger... | Mathias Agopian | 2011-01-27 | 0 | -0/+0 |
|\ \ \ \ \ \
| |/ / / / / |
|