summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am edfe20c4: am c636b846: Merge "Enhance WspTypeDecoder to decode Content Typ...John Huang2010-08-121-3/+12
|\
| * am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters"John Huang2010-08-121-3/+12
| |\
| | * Enhance WspTypeDecoder to decode Content Type ParametersDan Griffin2010-08-021-3/+12
* | | Merge "Update DeviceOrientationManager to be specific to a WebViewCore"Steve Block2010-08-123-14/+24
|\ \ \
| * | | Update DeviceOrientationManager to be specific to a WebViewCoreSteve Block2010-08-113-14/+24
* | | | Merge "Fix back popping the back stack too much."Dianne Hackborn2010-08-111-1/+1
|\ \ \ \
| * | | | Fix back popping the back stack too much.Dianne Hackborn2010-08-111-1/+1
* | | | | Fix bug 2911396 - documentation fixAdam Powell2010-08-111-1/+1
* | | | | Merge "Fix bug 2911311 and bug 2911700"Adam Powell2010-08-115-4/+51
|\ \ \ \ \
| * | | | | Fix bug 2911311 and bug 2911700Adam Powell2010-08-115-4/+51
* | | | | | Merge "Bunch of fixes."Romain Guy2010-08-111-1/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bunch of fixes.Romain Guy2010-08-111-1/+9
* | | | | | Fix the build from two breaking changes (update to current.xml and ViewRoot i...Chet Haase2010-08-111-0/+1
* | | | | | Merge "Fix bug 2911529"Adam Powell2010-08-111-1/+3
|\ \ \ \ \ \
| * | | | | | Fix bug 2911529Adam Powell2010-08-111-1/+3
| |/ / / / /
* | | | | | Merge "resolved conflicts for merge of 4e14159a to master"Jeff Brown2010-08-111-11/+20
|\ \ \ \ \ \
| * \ \ \ \ \ resolved conflicts for merge of 4e14159a to masterJeff Brown2010-08-111-11/+20
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | am bb65ae02: Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents...Jeff Brown2010-08-111-12/+20
| | |\ \ \ \
| | | * | | | Fix ViewRoot bug attempting to finish synthetic KeyEvents.Jeff Brown2010-08-111-12/+20
* | | | | | | Make Fragments use the new animation APIsChet Haase2010-08-1113-155/+332
|/ / / / / /
* | | | | | Merge "ActionBar overlay mode, height fetching, show/hide"Adam Powell2010-08-1110-6/+185
|\ \ \ \ \ \
| * | | | | | ActionBar overlay mode, height fetching, show/hideAdam Powell2010-08-1110-6/+185
* | | | | | | am f66f8a58: am 95af0c14: Merge "Add support for the PointerLocation overlay....Jeff Brown2010-08-113-5/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | am 95af0c14: Merge "Add support for the PointerLocation overlay." into ginger...Jeff Brown2010-08-113-5/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Add support for the PointerLocation overlay." into gingerbreadJeff Brown2010-08-113-5/+7
| | |\ \ \ \
| | | * | | | Add support for the PointerLocation overlay.Jeff Brown2010-08-113-5/+7
* | | | | | | Merge "add a Skip option"Freeman Ng2010-08-113-18/+47
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | add a Skip optionFreeman Ng2010-08-113-18/+47
* | | | | | | am f5ee5358: am ac9717ab: Merge "Move OBB file reading to DefaultContainerSer...Kenny Root2010-08-114-27/+104
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gi...Kenny Root2010-08-114-27/+104
| |\ \ \ \ \ | | |/ / / /
| | * | | | Move OBB file reading to DefaultContainerServiceKenny Root2010-08-114-27/+104
* | | | | | New assets for checkboxes and radio buttons.Gilles Debunne2010-08-1172-11/+127
* | | | | | Merge "Apparently people want to know what time it is."Daniel Sandler2010-08-111-1/+0
|\ \ \ \ \ \
| * | | | | | Apparently people want to know what time it is.Daniel Sandler2010-08-111-1/+0
* | | | | | | Merge "Split WifiStateMachine from WifiStateTracker"Irfan Sheriff2010-08-112-19/+6
|\ \ \ \ \ \ \
| * | | | | | | Split WifiStateMachine from WifiStateTrackerIrfan Sheriff2010-08-102-19/+6
* | | | | | | | am dc1f0858: am 9902196f: Fix npe in getCacheTotalSize.Patrick Scott2010-08-111-0/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | am 9902196f: Fix npe in getCacheTotalSize.Patrick Scott2010-08-111-0/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Fix npe in getCacheTotalSize.Patrick Scott2010-08-111-0/+3
* | | | | | | am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbreadDianne Hackborn2010-08-119-13/+240
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am a5ae50cd: Merge "More native work." into gingerbreadDianne Hackborn2010-08-119-13/+240
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | More native work.Dianne Hackborn2010-08-119-13/+240
* | | | | | | am 8279c754: am 91a7f5fe: Making sure that the prefix is handled properly.Konstantin Lopyrev2010-08-102-15/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 91a7f5fe: Making sure that the prefix is handled properly.Konstantin Lopyrev2010-08-102-15/+15
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Making sure that the prefix is handled properly.Konstantin Lopyrev2010-08-102-15/+15
* | | | | | | am e8fa85d7: am 224ab9a5: Merge "Fix public bug http://code.google.com/p/andr...Adam Powell2010-08-101-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 224ab9a5: Merge "Fix public bug http://code.google.com/p/android/issues/de...Adam Powell2010-08-101-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067...Adam Powell2010-08-101-2/+2
| | |\ \ \ \ \
| | | * | | | | Fix public bug http://code.google.com/p/android/issues/detail?id=10067Adam Powell2010-08-101-2/+2
| | | | |/ / / | | | |/| | |
* | | | | | | Merge "resolved conflicts for merge of f00ee0f7 to master"Konstantin Lopyrev2010-08-1012-87/+109
|\ \ \ \ \ \ \