summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge "Sprinkle new BlockGuard around SQLiteDatabase." into krakenBrad Fitzpatrick2010-06-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ am e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for burst...Andreas Huber2010-06-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to ...Andreas Huber2010-06-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Changes to the prefetcher to allow for bursts of data to be transferre...Andreas Huber2010-06-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | |
* | | | | | | | | | | | | am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox descript...Dirk Dougherty2010-06-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | / / / / / / / / / | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyoDirk Dougherty2010-06-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Doc change: Adjust security sandbox description." into froyoDirk Dougherty2010-06-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
* | | | | | | | | | | | am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStream...James Dong2010-06-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should...James Dong2010-06-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." ...James Dong2010-06-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | / / / | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
* | | | | | | | | | | am ee7e6a78: merge from open-source masterThe Android Open Source Project2010-06-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | merge from open-source masterThe Android Open Source Project2010-06-030-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Merge "Improved error-handling in Rfc822Tokenizer"Kenny Root2010-06-010-0/+0
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
* | | | | | | | | | Merge "Fixed some minor bugs in MotionEvent recycling." into krakenJeff Brown2010-06-020-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | am 105e1c5a: am 6a297118: Merge "docs: a couple doc bug fixes" into froyoScott Main2010-06-020-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | am 6a297118: Merge "docs: a couple doc bug fixes" into froyoScott Main2010-06-020-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge "docs: a couple doc bug fixes" into froyoScott Main2010-06-020-0/+0
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
* | | | | | | | am 1bd7597b: merge from open-source masterThe Android Open Source Project2010-06-020-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | merge from open-source masterThe Android Open Source Project2010-06-020-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
* | | | | | | | am c8763858: merge from open-source masterThe Android Open Source Project2010-06-020-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | merge from open-source masterThe Android Open Source Project2010-06-020-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
* | | | | | | am a6703415: am 85fb2066: Amend previous ndc commitKenny Root2010-06-010-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ am 85fb2066: Amend previous ndc commitKenny Root2010-06-010-0/+0
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ am 847b82d8: am 89bc1395: Merge "Add more error checking for ndc" into froyoKenny Root2010-06-010-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 89bc1395: Merge "Add more error checking for ndc" into froyoKenny Root2010-06-0169-3214/+4397
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | / / / / / / | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge "Add more error checking for ndc" into froyoKenny Root2010-06-0174-3224/+4423
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
* | | | | | | Merge "fix a bug where fading in/out of opaque 32-bits windows wasn't working...Mathias Agopian2010-06-012-22/+19
|\ \ \ \ \ \ \
| * | | | | | | fix a bug where fading in/out of opaque 32-bits windows wasn't workingMathias Agopian2010-06-012-22/+19
* | | | | | | | am 8799cdfb: am de56c27d: Merge "Doc change: rename slide decks for sorting b...Dirk Dougherty2010-06-010-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | am de56c27d: Merge "Doc change: rename slide decks for sorting by year then q...Dirk Dougherty2010-06-010-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Doc change: rename slide decks for sorting by year then quarter." into...Dirk Dougherty2010-06-010-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ am 1f5e8473: am a80331c4: Merge "Comment-only change to add documentation for...Dan Egnor2010-06-010-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a80331c4: Merge "Comment-only change to add documentation for FileObserver...Dan Egnor2010-06-010-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Comment-only change to add documentation for FileObserver" into froyoDan Egnor2010-06-010-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
* | | | | | | | am bce5edaf: am 862ad0e5: Merge "Doc change: updated dashboards stats." into ...Dirk Dougherty2010-06-010-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | am 862ad0e5: Merge "Doc change: updated dashboards stats." into froyoDirk Dougherty2010-06-010-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Doc change: updated dashboards stats." into froyoDirk Dougherty2010-06-010-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
* | | | | | | more clean-up in preparation of bigger changesMathias Agopian2010-05-2815-89/+116
* | | | | | | Fix a typo in Singleton<>Mathias Agopian2010-05-281-3/+5
* | | | | | | am 5c9d9949: am 6ee412d5: Also dump system process threads halfway through th...Christopher Tate2010-05-280-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 6ee412d5: Also dump system process threads halfway through the watchdog in...Christopher Tate2010-05-280-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
* | | | | | | Merge "Avoid copying for input recording frames in CameraSource" into krakenJames Dong2010-05-280-0/+0
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge "Add video frame parameter." into krakenWu-cheng Li2010-05-280-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge "more clean-up of Surfaceflinger's client management" into krakenMathias Agopian2010-05-274-257/+197
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | more clean-up of Surfaceflinger's client managementMathias Agopian2010-05-274-257/+197
| |/ / / / / / / /
* | | | | | | | | am 6cc13745: am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyoKenny Root2010-05-270-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyoKenny Root2010-05-270-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge "Fix typo in EastAsianWidth javadoc" into froyoKenny Root2010-05-270-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
* | | | | | | | | am 9eae9572: am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shar...Dirk Dougherty2010-05-270-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables direct...Dirk Dougherty2010-05-270-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /