summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix text encoding when drawing with drawPosText in softwareRomain Guy2012-01-175-0/+111
* Improve GLES20Canvas clip supportRomain Guy2012-01-171-6/+21
* Merge "Document update for WebView user to support HTML5 video"Teng-Hui Zhu2012-01-171-0/+9
|\
| * Document update for WebView user to support HTML5 videoTeng-Hui Zhu2012-01-121-0/+9
* | Merge "Expand WebKitHitTest and do some preliminary caching"John Reck2012-01-172-15/+67
|\ \
| * | Expand WebKitHitTest and do some preliminary cachingJohn Reck2012-01-132-15/+67
* | | Fix build for SDK on MacGlenn Kasten2012-01-171-0/+4
* | | Check stream type in AudioFlinger::createTrackGlenn Kasten2012-01-173-10/+14
* | | Merge "Fix locking for mMasterVolume and mMute"Glenn Kasten2012-01-172-4/+15
|\ \ \
| * | | Fix locking for mMasterVolume and mMuteGlenn Kasten2012-01-132-4/+15
* | | | Merge "Use size_t for frame size"Glenn Kasten2012-01-177-14/+20
|\ \ \ \
| * | | | Use size_t for frame sizeGlenn Kasten2012-01-137-14/+20
* | | | | Merge "Use audio_stream_type_t consistently"Glenn Kasten2012-01-1729-140/+143
|\ \ \ \ \
| * | | | | Use audio_stream_type_t consistentlyGlenn Kasten2012-01-1329-140/+143
| | |/ / / | |/| | |
* | | | | Merge "Add android.os.Process.setThreadScheduler"Glenn Kasten2012-01-172-9/+69
|\ \ \ \ \
| * | | | | Add android.os.Process.setThreadSchedulerGlenn Kasten2011-07-142-9/+69
* | | | | | Merge "AudioTrack and AudioFlinger send level cleanup"Glenn Kasten2012-01-173-7/+28
|\ \ \ \ \ \
| * | | | | | AudioTrack and AudioFlinger send level cleanupGlenn Kasten2012-01-133-7/+28
| | |/ / / / | |/| | | |
* | | | | | am 2afcd2d1: am 3938e4fb: Merge "docs: emphasize qualifier order and mention ...Scott Main2012-01-131-8/+16
|\ \ \ \ \ \
| * \ \ \ \ \ am 3938e4fb: Merge "docs: emphasize qualifier order and mention implicit vers...Scott Main2012-01-131-8/+16
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "docs: emphasize qualifier order and mention implicit version qualifer"...Scott Main2012-01-131-8/+16
| | |\ \ \ \ \ \
| | | * | | | | | docs: emphasize qualifier order and mention implicit version qualiferScott Main2012-01-131-8/+16
* | | | | | | | | am 114875e8: am 40d6e7d9: Merge "docs: mention x86 as a native platform filte...Scott Main2012-01-131-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1Scott Main2012-01-131-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "docs: mention x86 as a native platform filter" into ics-mr1Scott Main2012-01-131-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | docs: mention x86 as a native platform filterScott Main2012-01-131-2/+2
* | | | | | | | | | am d4d68fe2: am cc7bd5ab: Merge "Update notification documentation to follow ...Dianne Hackborn2012-01-133-103/+154
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am cc7bd5ab: Merge "Update notification documentation to follow current guide...Dianne Hackborn2012-01-133-103/+154
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Update notification documentation to follow current guidelines." into ...Dianne Hackborn2012-01-133-103/+154
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Update notification documentation to follow current guidelines.Dianne Hackborn2012-01-123-103/+154
* | | | | | | | | | | am 80c4cd1f: am bd9d9d3a: cherrypick from hc-mr2, updated adk installation in...Daniel Sandler2012-01-131-7/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Ch...Daniel Sandler2012-01-131-7/+8
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0...Daniel Sandler2012-01-131-7/+8
* | | | | | | | | | | Merge "cleanup for concurrency"Irfan Sheriff2012-01-137-409/+430
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cleanup for concurrencyIrfan Sheriff2012-01-137-409/+430
* | | | | | | | | | | | Merge "fix layer scrollbar updates"Michael Kolb2012-01-132-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix layer scrollbar updatesMichael Kolb2012-01-132-0/+9
* | | | | | | | | | | | | Merge "Introduce FileRotator."Jeff Sharkey2012-01-132-0/+758
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Introduce FileRotator.Jeff Sharkey2012-01-132-0/+758
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Fix compilation with Clang."Jeff Brown2012-01-131-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix compilation with Clang.Evgeniy Stepanov2012-01-131-4/+0
* | | | | | | | | | | | | | Merge "Fix a few memory leaks in the input dispatcher."Jeff Brown2012-01-132-6/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix a few memory leaks in the input dispatcher.Jeff Brown2012-01-122-6/+27
* | | | | | | | | | | | | | | Merge "Sub display list in TextView"Gilles Debunne2012-01-137-36/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Sub display list in TextViewGilles Debunne2012-01-127-36/+72
* | | | | | | | | | | | | | | | Merge "media/mtp: Add missing LOCAL_C_INCLUDES"David 'Digit' Turner2012-01-131-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | media/mtp: Add missing LOCAL_C_INCLUDESDavid 'Digit' Turner2012-01-131-0/+3
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Add support for new root.expand() calls."Stephen Hines2012-01-133-192/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add support for new root.expand() calls.Stephen Hines2012-01-123-192/+22
* | | | | | | | | | | | | | | | | Get AID_GRAPHICS from right placeGlenn Kasten2012-01-132-16/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |