summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Bin...tedbo2011-06-096-5/+209
* Merge "Fix USE_TEXT_LAYOUT_CACHE define"Fabrice Di Meglio2011-06-063-19/+43
|\
| * Fix USE_TEXT_LAYOUT_CACHE defineFabrice Di Meglio2011-06-063-19/+43
* | Merge "Connecting to a NFC technology may fail."Martijn Coenen2011-06-062-1/+8
|\ \
| * | Connecting to a NFC technology may fail.Martijn Coenen2011-06-062-1/+8
* | | Merge "Copy pointer assets for hdpi."Jeff Brown2011-06-068-0/+20
|\ \ \
| * | | Copy pointer assets for hdpi.Jeff Brown2011-06-068-0/+20
* | | | am 51704fc9: am cecb710a: am 94260caf: Allow control over search order for te...TK MUN2011-06-061-0/+1
|\ \ \ \
| * \ \ \ am cecb710a: am 94260caf: Allow control over search order for tethering upstr...TK MUN2011-06-061-0/+1
| |\ \ \ \
| | * \ \ \ am 94260caf: Allow control over search order for tethering upstream interface...TK MUN2011-05-251-0/+1
| | |\ \ \ \
| | | * | | | Allow control over search order for tethering upstream interface selectionTK MUN2011-05-251-0/+1
* | | | | | | am 5aaed097: am 58ada2f3: am 94062517: Merge "Require bonding and encryption ...Jaikumar Ganesh2011-06-061-3/+63
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server"Jaikumar Ganesh2011-06-061-3/+63
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 94062517: Merge "Require bonding and encryption for PBAP server"Jaikumar Ganesh2011-05-251-3/+63
| | |\ \ \ \
| | | * \ \ \ Merge "Require bonding and encryption for PBAP server"Jaikumar Ganesh2011-05-251-3/+63
| | | |\ \ \ \
| | | | * | | | Require bonding and encryption for PBAP serverMathias Jeppsson2011-05-171-3/+63
* | | | | | | | Cleanup of Calendar.java to prep for apiRoboErik2011-06-061-264/+568
* | | | | | | | Merge "Delay set picture if necessary"John Reck2011-06-061-1/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Delay set picture if necessaryJohn Reck2011-06-041-1/+17
* | | | | | | | | Merge "Remove dead code related to gettid"Glenn Kasten2011-06-061-12/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Remove dead code related to gettidGlenn Kasten2011-06-031-12/+1
* | | | | | | | | resolved conflict for merge of fc51aaec to masterWink Saville2011-06-041-4/+33
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 6ff5ba00: Merge "Add FileUtils.checksumCrc32" into honeycomb-LTEWink Saville2011-06-041-4/+33
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge "Add FileUtils.checksumCrc32" into honeycomb-LTEWink Saville2011-06-041-4/+33
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add FileUtils.checksumCrc32Wink Saville2011-06-031-4/+33
* | | | | | | | | | am 7e5ca578: am b4815f47: am bd754205: Merge "Fix to not lose state when savi...Dianne Hackborn2011-06-031-8/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactiva...Dianne Hackborn2011-06-031-8/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am bd754205: Merge "Fix to not lose state when saving a deactivated fragment....Dianne Hackborn2011-06-031-8/+6
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix to not lose state when saving a deactivated fragment.Dianne Hackborn2011-06-031-8/+6
* | | | | | | | | | | am e826feb6: am dddd6b15: am 185e3e24: Fix when managed cursors are required.Dianne Hackborn2011-06-031-16/+18
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am dddd6b15: am 185e3e24: Fix when managed cursors are required.Dianne Hackborn2011-06-031-16/+18
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 185e3e24: Fix when managed cursors are required.Dianne Hackborn2011-06-031-16/+18
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Fix when managed cursors are required.Dianne Hackborn2011-06-031-16/+18
* | | | | | | | | | resolved conflicts for merge of 955e8d79 to masterJeff Brown2011-06-031-14/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | am 00afa11c: am 0538e621: Merge "Tap timeout removed on paste. Relying on pos...Gilles Debunne2011-06-031-18/+13
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 0538e621: Merge "Tap timeout removed on paste. Relying on position only." ...Gilles Debunne2011-06-031-18/+13
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "Tap timeout removed on paste. Relying on position only." into honeycom...Gilles Debunne2011-06-031-18/+13
| | | |\ \ \ \ \ \
| | | | * | | | | | Tap timeout removed on paste. Relying on position only.Gilles Debunne2011-06-021-18/+13
| * | | | | | | | | am e10de072: am be96408b: (Do not merge) Backport a fix for InputMethodManage...satok2011-06-021-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am be96408b: (Do not merge) Backport a fix for InputMethodManager.javasatok2011-06-021-2/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | (Do not merge) Backport a fix for InputMethodManager.javasatok2011-06-031-2/+2
* | | | | | | | | | resolved conflicts for merge of d247ee41 to masterDianne Hackborn2011-06-035-23/+151
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | am 758b67b1: am b46ed763: Add new Fragment API for explicitly saving/restorin...Dianne Hackborn2011-06-025-23/+151
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am b46ed763: Add new Fragment API for explicitly saving/restoring state.Dianne Hackborn2011-06-025-23/+151
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Add new Fragment API for explicitly saving/restoring state.Dianne Hackborn2011-06-025-23/+151
* | | | | | | | | Merge "resolved conflicts for merge of ca2b552d to master"Jeff Brown2011-06-034-0/+30
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ resolved conflicts for merge of ca2b552d to masterJeff Brown2011-06-034-0/+30
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am c8812761: am e1718de6: Merge "Add a preference panel for mouse speed." int...Jeff Brown2011-06-024-0/+30
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2Jeff Brown2011-06-024-0/+30
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Add a preference panel for mouse speed.Jeff Brown2011-06-024-0/+30