summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unnecessary this->Glenn Kasten2011-12-141-15/+15
* Merge "Remove BlockingMediaPlayer."Narayan Kamath2011-12-094-205/+76
|\
| * Remove BlockingMediaPlayer.Narayan Kamath2011-12-064-205/+76
* | Merge "GenerationCache::get would return a random value instead of NULL Bug #...Romain Guy2011-12-081-2/+4
|\ \
| * | GenerationCache::get would return a random value instead of NULLRomain Guy2011-12-081-2/+4
* | | Update computation of reading level scale.Mangesh Ghiware2011-12-083-11/+16
* | | Merge "Clean TextLayout code and remove RTL_USE_HARFBUZZ"Fabrice Di Meglio2011-12-087-367/+86
|\ \ \
| * | | Clean TextLayout code and remove RTL_USE_HARFBUZZFabrice Di Meglio2011-12-087-367/+86
* | | | Merge "Add aapt support for implicitly-granted permissions"Kenny Root2011-12-081-0/+19
|\ \ \ \
| * | | | Add aapt support for implicitly-granted permissionsKenny Root2011-12-081-0/+19
* | | | | Merge "Update onVideoSizeChanged() callback method Java doc to explicitly spe...James Dong2011-12-071-0/+3
|\ \ \ \ \
| * | | | | Update onVideoSizeChanged() callback method Java doc to explicitly specify th...James Dong2011-12-061-0/+3
* | | | | | am e118c1de: am ef8913c0: Merge "Remove dangerous and useless optimization Bu...Dave Burke2011-12-071-7/+1
|\ \ \ \ \ \
| * \ \ \ \ \ am ef8913c0: Merge "Remove dangerous and useless optimization Bug #5525888" i...Dave Burke2011-12-071-7/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1Dave Burke2011-12-071-7/+1
| | |\ \ \ \ \ \
| | | * | | | | | Remove dangerous and useless optimizationRomain Guy2011-12-071-7/+1
* | | | | | | | | am ea75b822: am 234a5ef6: Merge "When the SIM_READY set current preferred net...Wink Saville2011-12-075-0/+33
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 234a5ef6: Merge "When the SIM_READY set current preferred network type." i...Wink Saville2011-12-075-0/+33
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "When the SIM_READY set current preferred network type." into ics-mr1Wink Saville2011-12-075-0/+33
| | |\ \ \ \ \ \ \
| | | * | | | | | | When the SIM_READY set current preferred network type.Wink Saville2011-12-075-0/+33
* | | | | | | | | | am 38342c9d: am d426c338: Merge "Reduce likelihood of crash in state machine....Jaikumar Ganesh2011-12-071-5/+47
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1Jaikumar Ganesh2011-12-071-5/+47
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Reduce likelihood of crash in state machine." into ics-mr1Jaikumar Ganesh2011-12-071-5/+47
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Reduce likelihood of crash in state machine.Jaikumar Ganesh2011-12-071-5/+47
* | | | | | | | | | am 2de0b07f: am ca0a68cc: Merge "Correct the dialing number of structured MMI...John Wang2011-12-071-2/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am ca0a68cc: Merge "Correct the dialing number of structured MMI." into ics-mr1John Wang2011-12-071-2/+18
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Correct the dialing number of structured MMI." into ics-mr1John Wang2011-12-071-2/+18
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Correct the dialing number of structured MMI.John Wang2011-12-071-2/+18
* | | | | | | | | | | am 0235016a: am 2df13452: Merge "Insert into user dict with the correct local...Gilles Debunne2011-12-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1Gilles Debunne2011-12-071-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Insert into user dict with the correct locale" into ics-mr1Gilles Debunne2011-12-071-0/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Insert into user dict with the correct localeJean Chalard2011-12-071-0/+1
* | | | | | | | | | | | resolved conflicts for merge of db81dc72 to masterAdam Powell2011-12-072-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am cf6a6522: Merge "Raise touch slop value from previous experiment" into ics...Adam Powell2011-12-072-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Raise touch slop value from previous experiment" into ics-mr1Adam Powell2011-12-072-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Raise touch slop value from previous experimentAdam Powell2011-12-072-2/+2
* | | | | | | | | | | | | am b490d8d6: am 29933fb2: Merge "Improve handling of small largeIcons in tabl...Daniel Sandler2011-12-074-8/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 29933fb2: Merge "Improve handling of small largeIcons in tablet ticker." i...Daniel Sandler2011-12-074-8/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1Daniel Sandler2011-12-074-8/+40
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Improve handling of small largeIcons in tablet ticker.Daniel Sandler2011-12-074-8/+40
* | | | | | | | | | | | | | am bea42859: am aa2719df: am 3937e055: Merge "DOC CHANGE: Add text for androi...Joe Malin2011-12-071-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am aa2719df: am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage"...Joe Malin2011-12-071-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0Joe Malin2011-12-071-0/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0Joe Malin2011-12-071-0/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | DOC CHANGE: Add text for android.os.storageJoe Malin2011-12-071-0/+8
* | | | | | | | | | | | | | | | am 7377e593: am 0e385ee4: am b32785c6: Merge "More fixing for issue #5366535:...Dianne Hackborn2011-12-071-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 0e385ee4: am b32785c6: Merge "More fixing for issue #5366535: Lockscreen h...Dianne Hackborn2011-12-071-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am b32785c6: Merge "More fixing for issue #5366535: Lockscreen has wrong layo...Dianne Hackborn2011-12-071-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into i...Dianne Hackborn2011-12-071-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | More fixing for issue #5366535: Lockscreen has wrong layout...Dianne Hackborn2011-12-071-0/+3