summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am 567722ee: Merge "Fix problems with determining when to kill apps for wake ...Dianne Hackborn2010-08-156-21/+174
|\
| * Merge "Fix problems with determining when to kill apps for wake usage." into ...Dianne Hackborn2010-08-156-21/+174
| |\
| | * Fix problems with determining when to kill apps for wake usage.Dianne Hackborn2010-08-156-21/+174
* | | am e300b8c1: Merge "DO NOT MERGE Always set/remove default routes." into ging...Robert Greenwalt2010-08-131-6/+2
|\ \ \ | |/ /
| * | Merge "DO NOT MERGE Always set/remove default routes." into gingerbreadRobert Greenwalt2010-08-131-6/+2
| |\ \ | | |/ | |/|
| | * DO NOT MERGE Always set/remove default routes.Robert Greenwalt2010-08-131-6/+2
* | | am a8d9291d: Merge "Various battery info things:" into gingerbreadDianne Hackborn2010-08-134-37/+305
|\ \ \ | |/ /
| * | Various battery info things:Dianne Hackborn2010-08-134-37/+305
| |/
* | am ccaa0028: Merge "Improve camera documentation." into gingerbreadWu-cheng Li2010-08-121-17/+21
|\ \ | |/
| * Improve camera documentation.Wu-cheng Li2010-08-121-17/+21
* | 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
* | | 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
* | | 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
* | | | 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
* | | | am 9902196f: Fix npe in getCacheTotalSize.Patrick Scott2010-08-111-0/+3
|\ \ \ \ | |/ / /
| * | | Fix npe in getCacheTotalSize.Patrick Scott2010-08-111-0/+3
* | | | am a5ae50cd: Merge "More native work." into gingerbreadDianne Hackborn2010-08-113-6/+71
|\ \ \ \ | |/ / /
| * | | More native work.Dianne Hackborn2010-08-113-6/+71
* | | | 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 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
| | |/ /
* | | | am f39d5987: Merge "Categorizing exported view properties." into gingerbreadKonstantin Lopyrev2010-08-1012-87/+109
|\ \ \ \ | |/ / /
| * | | Merge "Categorizing exported view properties." into gingerbreadKonstantin Lopyrev2010-08-1012-87/+109
| |\ \ \ | | |/ / | |/| |
| | * | Categorizing exported view properties.Konstantin Lopyrev2010-08-1012-87/+109
* | | | am c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode().Jeff Brown2010-08-101-1/+1
|\ \ \ \ | |/ / /
| * | | Fix safe mode and KeyEvent.getMaxKeyCode().Jeff Brown2010-08-101-1/+1
* | | | am d98d0fc6: Merge "Optimize VelocityTracker to run in linear time." into gin...Jeff Brown2010-08-102-81/+157
|\ \ \ \ | |/ / /
| * | | Merge "Optimize VelocityTracker to run in linear time." into gingerbreadJeff Brown2010-08-102-81/+157
| |\ \ \
| | * | | Optimize VelocityTracker to run in linear time.Jeff Brown2010-08-092-81/+157
* | | | | am 745d1e90: Merge "Update javadoc for the API and change return of getBonded...Jaikumar Ganesh2010-08-091-1/+31
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Update javadoc for the API and change return of getBondedDevices()." i...Jaikumar Ganesh2010-08-091-1/+31
| |\ \ \ \
| | * | | | Update javadoc for the API and change return of getBondedDevices().Jaikumar Ganesh2010-08-091-1/+31
* | | | | | am 63cca691: Merge "Make sure profiling is done only for views that are actua...Konstantin Lopyrev2010-08-092-54/+68
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Make sure profiling is done only for views that are actually measured,...Konstantin Lopyrev2010-08-092-54/+68
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | Make sure profiling is done only for views that are actually measured, laid o...Konstantin Lopyrev2010-08-062-54/+68
* | | | | am cbaef518: Merge "Check whether Bluetooth is enabled before making any API ...Jaikumar Ganesh2010-08-091-0/+10
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Check whether Bluetooth is enabled before making any API calls." into ...Jaikumar Ganesh2010-08-091-0/+10
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Check whether Bluetooth is enabled before making any API calls.Jaikumar Ganesh2010-08-091-0/+10
* | | | | am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting g...Dan Egnor2010-08-061-69/+73
|\ \ \ \ \ | |/ / / /
| * | | | am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (...Dan Egnor2010-08-061-69/+73
| |\ \ \ \
| | * \ \ \ Merge "COMMENT ONLY change to fix some formatting glitches and (more importan...Dan Egnor2010-08-061-69/+73
| | |\ \ \ \
| | | * | | | COMMENT ONLY change to fix some formatting glitches andDan Egnor2010-08-021-69/+73
| | * | | | | Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using ...Adam Powell2010-08-051-1/+5
| | |\ \ \ \ \