summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix keyguard wake-up issue.Jeff Brown2012-07-191-6/+10
* Merge "Fun with Up navigation"Adam Powell2012-07-194-22/+29
|\
| * Fun with Up navigationAdam Powell2012-07-194-22/+29
* | Merge "Update JavaDoc for PictureListener after fix to capture layers"Steve Block2012-07-191-13/+14
|\ \
| * | Update JavaDoc for PictureListener after fix to capture layersSteve Block2012-07-191-13/+14
| |/
* | am 1c7a9b2e: am b949d416: update Google IO announcement on homepageScott Main2012-07-191-6/+5
|\ \
| * \ am b949d416: update Google IO announcement on homepageScott Main2012-07-191-6/+5
| |\ \
| | * | update Google IO announcement on homepageScott Main2012-07-191-6/+5
* | | | Merge "Test aggressive throttling"John Reck2012-07-192-0/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Test aggressive throttlingJohn Reck2012-06-152-0/+9
* | | | am 67144427: Reconcile with jb-mr0-release jb-releaseThe Android Open Source Project2012-07-190-0/+0
|\ \ \ \ | | |/ / | |/| |
| | | |
| | \ \
| *-. \ \ Reconcile with jb-mr0-release jb-releaseThe Android Open Source Project2012-07-190-0/+0
| |\ \ \ \
| | | * | | Preserve retryCount when retrying.Wink Saville2012-07-135-28/+100
| | | * | | When reconnecting disassociate dc and apnContext.Wink Saville2012-07-131-0/+2
| | * | | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-180-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-170-0/+0
| | | |\ \ \ \
| | | | * | | | Handle keyguard visibility states separately. DO NOT MERGECraig Mautner2012-07-111-6/+23
| | | | * | | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-110-0/+0
| | | | |\ \ \ \ | | | | | |/ / /
* | | | | | | | am c43a685c: (-s ours) Merge "Change audio flinger to user HAL master mute if...John Grossman2012-07-190-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge "Change audio flinger to user HAL master mute if available: DO NOT MERG...John Grossman2012-07-182-16/+100
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Change audio flinger to user HAL master mute if available: DO NOT MERGEJohn Grossman2012-07-172-16/+100
* | | | | | | | | | am ee2585e5: am 553e3898: Merge "Improve test key names to reproduce public i...Brian Carlstrom2012-07-191-9/+11
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | am 553e3898: Merge "Improve test key names to reproduce public issue" into jb...Brian Carlstrom2012-07-181-9/+11
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge "Improve test key names to reproduce public issue" into jb-devBrian Carlstrom2012-07-181-9/+11
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | Improve test key names to reproduce public issueBrian Carlstrom2012-07-171-9/+11
| | | | |_|/ / / / | | | |/| | | | |
* | | | | | | | | Merge "Optimize gradient textures"Romain Guy2012-07-181-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Optimize gradient texturesRomain Guy2012-07-181-1/+1
* | | | | | | | | | am d1a0a53e: am 5d478b9c: Merge "Changed to obtain a parcel in each notify() ...James Dong2012-07-182-8/+5
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am 5d478b9c: Merge "Changed to obtain a parcel in each notify() call in jni."...James Dong2012-07-182-8/+5
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Changed to obtain a parcel in each notify() call in jni." into jb-devJames Dong2012-07-182-8/+5
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Changed to obtain a parcel in each notify() call in jni.Insun Kang2012-07-102-8/+5
* | | | | | | | | | | am d173b10a: (-s ours) am a4d4df16: Merge "Import translations. DO NOT MERGE"...Ying Wang2012-07-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am a4d4df16: Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-07-182-5/+5
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-07-182-5/+5
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Import translations. DO NOT MERGEYing Wang2012-07-182-5/+5
* | | | | | | | | | | | am f80ba4a5: am 12a54752: docs: update hw accel attribute\'s default behavior...Scott Main2012-07-182-28/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 12a54752: docs: update hw accel attribute\'s default behavior and fix link...Scott Main2012-07-182-28/+30
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | docs: update hw accel attribute's default behavior and fix link to l10n tutorialScott Main2012-07-182-28/+30
| | |/ / / / / / / / /
* | | | | | | | | | | am f22beb3f: am 0038ec11: Merge "Fix stuck status bars." into jb-devDaniel Sandler2012-07-181-6/+28
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 0038ec11: Merge "Fix stuck status bars." into jb-devDaniel Sandler2012-07-181-7/+28
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Fix stuck status bars." into jb-devDaniel Sandler2012-07-181-7/+28
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix stuck status bars.Daniel Sandler2012-07-181-7/+28
* | | | | | | | | | | | am a482028e: am a44794f4: Merge "Doc change: add button link to developer con...Dirk Dougherty2012-07-181-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am a44794f4: Merge "Doc change: add button link to developer console." into j...Dirk Dougherty2012-07-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Doc change: add button link to developer console." into jb-devDirk Dougherty2012-07-181-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Doc change: add button link to developer console.Dirk Dougherty2012-07-171-2/+2
* | | | | | | | | | | | | am 22f742e6: am 23369747: Merge "docs: Updating <uses-sdk> docs, bug fix: b/6...Joe Fernandez2012-07-181-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 23369747: Merge "docs: Updating <uses-sdk> docs, bug fix: b/6836256" into ...Joe Fernandez2012-07-181-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "docs: Updating <uses-sdk> docs, bug fix: b/6836256" into jb-devJoe Fernandez2012-07-181-1/+7
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | docs: Updating <uses-sdk> docs, bug fix: b/6836256Joe Fernandez2012-07-171-1/+7