summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | am efebdf4b: (-s ours) DO NOT MERGE: Support non-multiple-of-16 dimensions in...Andreas Huber2011-01-290-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software d...Andreas Huber2011-01-243-9/+23
* | | | | | am 28c4f69a: Updated checkbox assetsJustin Ho2011-01-290-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Updated checkbox assetsJustin Ho2011-01-2420-0/+0
| | |_|_|/ | |/| | |
* | | | | am 5e81a6e2: Fix trace mismatch.Arnaud Ferir2011-01-291-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix trace mismatch.Arnaud Ferir2011-01-241-1/+1
* | | | | am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.Sylvain Fonteneau2011-01-291-2/+16
|\ \ \ \ \ | |/ / / /
| * | | | Handle mock tags in android.nfc.Tag conversion to Parcel.Sylvain Fonteneau2011-01-241-2/+16
* | | | | am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into ging...John Wang2011-01-291-18/+56
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Enable recovery in RIL wakelock release check." into gingerbreadJohn Wang2011-01-241-18/+56
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Enable recovery in RIL wakelock release check.John Wang2011-01-211-18/+56
* | | | | Merge c896d85c from gingerbreadJean-Baptiste Queru2011-01-292-12/+23
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add operands to mifare classic increment, decrement." into gingerbreadNick Pelly2011-01-232-12/+23
| |\ \ \ \
| | * | | | Add operands to mifare classic increment, decrement.Nick Pelly2011-01-232-12/+23
* | | | | | Merge da01b4ab from gingerbreadJean-Baptiste Queru2011-01-292-270/+229
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Make MifareClassic methods more consistent." into gingerbreadNick Pelly2011-01-232-270/+229
| |\ \ \ \ \ | | |/ / / /
| | * | | | Make MifareClassic methods more consistent.Nick Pelly2011-01-232-270/+229
* | | | | | am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catc...Jeff Hamilton2011-01-291-5/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Allow null filters for foreground dispatch to act as catch all." into ...Jeff Hamilton2011-01-231-5/+11
| |\ \ \ \ \
| | * | | | | Allow null filters for foreground dispatch to act as catch all.Jeff Hamilton2011-01-231-5/+11
* | | | | | | am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.Jim Miller2011-01-291-2/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix 3379239: Catch exceptions from workaround for OOM.Jim Miller2011-01-231-2/+10
| |/ / / / /
* | | | | | am 1c9761e3: (-s ours) Merge "Do Not Merge Connect other profiles when priori...Jaikumar Ganesh2011-01-280-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Do Not Merge Connect other profiles when priority is auto connect." in...Jaikumar Ganesh2011-01-211-5/+9
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Do Not Merge Connect other profiles when priority is auto connect.Jaikumar Ganesh2011-01-211-5/+9
* | | | | | am 398a589c: (-s ours) Merge "DO NOT MERGE - Create db path if it doesn\'t ex...John Reck2011-01-280-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "DO NOT MERGE - Create db path if it doesn't exit" into gingerbreadJohn Reck2011-01-211-3/+7
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | DO NOT MERGE - Create db path if it doesn't exitJohn Reck2011-01-211-3/+7
* | | | | | resolved conflicts for merge of dc54a8c7 to honeycomb-mergeJeff Hamilton2011-01-2815-297/+381
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "API changes for NFC." into gingerbreadJeff Hamilton2011-01-2115-297/+381
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | API changes for NFC.Jeff Hamilton2011-01-2115-297/+381
* | | | | | am a314f32b: (-s ours) Merge "Bug 3365937 notify TTS initialization listener ...Jean-Michel Trivi2011-01-280-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Bug 3365937 notify TTS initialization listener of binding errors" into...Jean-Michel Trivi2011-01-211-5/+16
| |\ \ \ \ \
| | * | | | | Bug 3365937 notify TTS initialization listener of binding errorsJean-Michel Trivi2011-01-201-5/+16
* | | | | | | resolved conflicts for merge of a314f32b to honeycomb-mergeJeff Hamilton2011-01-281-6/+17
* | | | | | | am c5694ebd: (-s ours) Merge "do not merge - Fix issue 3371096." into gingerb...Eric Laurent2011-01-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "do not merge - Fix issue 3371096." into gingerbreadEric Laurent2011-01-201-8/+10
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | do not merge - Fix issue 3371096.Eric Laurent2011-01-201-8/+10
* | | | | | | am 11576102: (-s ours) Fix issue #3373438: Update GBMR versionsDianne Hackborn2011-01-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix issue #3373438: Update GBMR versionsDianne Hackborn2011-01-202-1/+17
| |/ / / / /
* | | | | | am 65d39eeb: (-s ours) Merge "DO NOT MERGE: Prefill the cache before trying t...Dave Sparks2011-01-270-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media...Dave Sparks2011-01-192-3/+31
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | DO NOT MERGE: Prefill the cache before trying to instantiate the media extrac...Andreas Huber2011-01-192-3/+31
* | | | | | am 822d4ce6: Merge "fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and...Mathias Agopian2011-01-270-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs...Mathias Agopian2011-01-192-4/+4
| |\ \ \ \ \
| | * | | | | fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when r...Mathias Agopian2011-01-192-4/+4
| | |/ / / /
* | | | | | am d0725eef: (-s ours) Merge "Never drag scroll views with no children. (DO N...Jeff Brown2011-01-270-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerb...Jeff Brown2011-01-192-7/+11
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Never drag scroll views with no children. (DO NOT MERGE)Jeff Brown2011-01-192-7/+11
* | | | | | am a0bafb47: Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into ginger...Mathias Agopian2011-01-270-0/+0
|\ \ \ \ \ \ | |/ / / / /