summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix possible infinite loop when purging textures."Romain Guy2010-09-081-0/+5
|\
| * Fix possible infinite loop when purging textures.Romain Guy2010-09-081-0/+5
* | resolved conflicts for merge of a05088c1 to masterJeff Brown2010-09-081-1/+7
|\ \
| * \ am 85a31767: Add support for secure views.Jeff Brown2010-09-081-1/+7
| |\ \
| | * | Add support for secure views.Jeff Brown2010-09-081-1/+7
* | | | am 664c48e9: am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbreadElliott Hughes2010-09-084-174/+0
|\ \ \ \ | |/ / /
| * | | am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbreadElliott Hughes2010-09-084-174/+0
| |\ \ \ | | |/ /
| | * | Merge "Remove dead code: NIOBuffer." into gingerbreadElliott Hughes2010-09-084-174/+0
| | |\ \
| | | * | Remove dead code: NIOBuffer.Elliott Hughes2010-09-074-174/+0
* | | | | am 8fc6f8b2: am 1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDe...Wei-Ta Chen2010-09-079-423/+347
|\ \ \ \ \ | |/ / / /
| * | | | am 1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for hav...Wei-Ta Chen2010-09-079-423/+347
| |\ \ \ \ | | |/ / /
| | * | | Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."Wei-Ta Chen2010-09-089-423/+347
| * | | | am d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gin...Dmitry Shmidt2010-09-071-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbreadDmitry Shmidt2010-09-071-1/+1
| | |\ \ \
| | | * | | Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGEIrfan Sheriff2010-09-071-1/+1
| | | |/ /
* | | | | am a295a390: am b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder fo...Wei-Ta Chen2010-09-079-347/+423
|\ \ \ \ \ | |/ / / /
| * | | | am b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder for having a be...Wei-Ta Chen2010-09-079-347/+423
| |\ \ \ \ | | |/ / /
| | * | | Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." in...Wei-Ta Chen2010-09-079-347/+423
| | |\ \ \
| | | * | | Rename LargeBitmap to BitmapRegionDecoder for having a better API.Wei-Ta Chen2010-09-079-347/+423
| | | |/ /
* | | | | am a1205f07: am 2d3739d4: Merge "Modify native ALooper to take an explicit id...Dianne Hackborn2010-09-071-3/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gi...Dianne Hackborn2010-09-071-3/+4
| |\ \ \ \ | | |/ / /
| | * | | Modify native ALooper to take an explicit ident.Dianne Hackborn2010-09-071-3/+4
* | | | | am b8bcfed5: am f703b77c: Merge "Add system property to turn off scheduling g...Dianne Hackborn2010-09-071-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | am f703b77c: Merge "Add system property to turn off scheduling groups." into ...Dianne Hackborn2010-09-071-2/+1
| |\ \ \ \ | | |/ / /
| | * | | Add system property to turn off scheduling groups.Dianne Hackborn2010-09-071-2/+1
| | |/ /
* | | | android change to handle Change-Id: Idbeed81b5b7349059e467b33a8641abf0b4aaeffVasu Nori2010-09-071-0/+3
| |_|/ |/| |
* | | Merge "Add set/get band in WifiNative"Irfan Sheriff2010-09-021-0/+26
|\ \ \
| * | | Add set/get band in WifiNativeIrfan Sheriff2010-09-021-0/+26
* | | | Merge "Use the new signals sent by Bluez for PAN."Jaikumar Ganesh2010-09-021-3/+66
|\ \ \ \
| * | | | Use the new signals sent by Bluez for PAN.Jaikumar Ganesh2010-09-021-3/+66
| |/ / /
* | | | Merge "fix isIntegrityCheck() & add a sample impl class and test for Database...Vasu Nori2010-09-021-4/+4
|\ \ \ \
| * | | | fix isIntegrityCheck() & add a sample impl class and test for DatabaseErrorHa...Vasu Nori2010-08-301-4/+4
* | | | | am 14d56840: am bc5ec2f9: Merge "Improve messages when java process is starti...Dianne Hackborn2010-09-011-3/+6
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | am bc5ec2f9: Merge "Improve messages when java process is starting." into gin...Dianne Hackborn2010-09-011-3/+6
| |\ \ \ | | | |/ | | |/|
| | * | Improve messages when java process is starting.Dianne Hackborn2010-09-011-3/+6
* | | | am ae087369: am 63070856: Merge "Don\'t propagate StrictMode over one-way Bin...Brad Fitzpatrick2010-08-311-0/+1
|\ \ \ \ | |/ / /
| * | | am 63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." i...Brad Fitzpatrick2010-08-311-0/+1
| |\ \ \ | | |/ /
| | * | Don't propagate StrictMode over one-way Binder calls.Brad Fitzpatrick2010-08-311-0/+1
* | | | Add hooks for hardware accelerated WebView.Romain Guy2010-08-311-0/+12
* | | | Merge "resolved conflicts for merge of 4ea54f44 to master"Robert Greenwalt2010-08-271-17/+17
|\ \ \ \
| * | | | resolved conflicts for merge of 4ea54f44 to masterRobert Greenwalt2010-08-271-17/+17
| | |_|/ | |/| |
* | | | am 95464c9a: am 445ab76c: Merge "Broken build. Missing ;" into gingerbreadGilles Debunne2010-08-271-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | am 445ab76c: Merge "Broken build. Missing ;" into gingerbreadGilles Debunne2010-08-271-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Broken build. Missing ;Gilles Debunne2010-08-271-1/+1
* | | | am 084dd872: am b8fd0473: Merge "Fix for 512 limit in assetManager.list" into...Gilles Debunne2010-08-271-77/+77
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | am b8fd0473: Merge "Fix for 512 limit in assetManager.list" into gingerbreadGilles Debunne2010-08-271-77/+77
| |\ \ | | |/
| | * Fix for 512 limit in assetManager.listGilles Debunne2010-08-261-77/+77
| * | resolved conflicts for merge of b998f311 to gingerbread-plus-aospRobert Greenwalt2010-08-251-16/+15
| |\ \ | | |/ | |/|
| | * Add an API to request route to an IPv6 host.Banavathu, Srinivas Naik2010-08-191-14/+14
| | * am d19c397b: Merge "Do not log AT command traffic by default." into froyoNick Pelly2010-06-241-2/+2
| | |\