summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Only show launcher for the bottom activity in a task" into klp-devCraig Mautner2013-09-201-1/+1
|\
| * Only show launcher for the bottom activity in a taskCraig Mautner2013-09-191-1/+1
* | Merge "Add config setting for default sms app." into klp-devDavid Braun2013-09-202-0/+8
|\ \
| * | Add config setting for default sms app.David Braun2013-09-192-0/+8
* | | Merge "Workaround for slow AudioRecord destructor" into klp-devGlenn Kasten2013-09-201-0/+23
|\ \ \
| * | | Workaround for slow AudioRecord destructorGlenn Kasten2013-09-191-0/+23
* | | | am 41c3c2b6: am 6e3b21cc: am 72f65780: Merge "docs: Fix for SDK 22.2.1 Window...Joe Fernandez2013-09-191-2/+2
|\ \ \ \
| * \ \ \ am 6e3b21cc: am 72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download ch...Joe Fernandez2013-09-191-2/+2
| |\ \ \ \
| | * \ \ \ am 72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and si...Joe Fernandez2013-09-191-2/+2
| | |\ \ \ \
| | | * \ \ \ Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-m...Joe Fernandez2013-09-191-2/+2
| | | |\ \ \ \
| | | | * | | | docs: Fix for SDK 22.2.1 Windows download checksum and sizeJoe Fernandez2013-09-191-2/+2
* | | | | | | | am 354b4fef: am 0d8f0849: am 1d65500d: docs: Google APIs emulator 18 r3 - Pla...Joe Fernandez2013-09-191-3/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 0d8f0849: am 1d65500d: docs: Google APIs emulator 18 r3 - Platform Release...Joe Fernandez2013-09-191-3/+18
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 1d65500d: docs: Google APIs emulator 18 r3 - Platform Release NotesJoe Fernandez2013-09-191-3/+18
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | docs: Google APIs emulator 18 r3 - Platform Release NotesJoe Fernandez2013-09-191-3/+18
| | | |/ / / /
* | | | | | | Merge "fix typo" into klp-devEd Heyl2013-09-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | fix typoEd Heyl2013-09-191-1/+1
* | | | | | | | Merge "Skip writing zeroes to java allocated memory." into klp-devLeon Scroggins III2013-09-191-1/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Skip writing zeroes to java allocated memory.Leon Scroggins III2013-09-191-1/+9
* | | | | | | | | Merge "fix emoji clipping in hw draw path" into klp-devVictoria Lease2013-09-191-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix emoji clipping in hw draw pathVictoria Lease2013-09-191-1/+1
* | | | | | | | | | Merge "Fix a regression in pausing activity immediately on sleep" into klp-devAmith Yamasani2013-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix a regression in pausing activity immediately on sleepAmith Yamasani2013-09-191-1/+1
* | | | | | | | | | Merge "TextureView/GLES20Canvas: Support synchronous GLConsumers" into klp-devEino-Ville Talvala2013-09-191-0/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | TextureView/GLES20Canvas: Support synchronous GLConsumersEino-Ville Talvala2013-09-191-0/+17
* | | | | | | | | | | Merge "Implement issue #10691475: Kill cached processes if about to..." into ...Dianne Hackborn2013-09-1912-263/+397
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Implement issue #10691475: Kill cached processes if about to...Dianne Hackborn2013-09-1912-263/+397
* | | | | | | | | | | | Merge "Camera2Tests: create new directory for manual camera2 test apps" into ...Igor Murashkin2013-09-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Camera2Tests: create new directory for manual camera2 test appsIgor Murashkin2013-09-181-0/+1
* | | | | | | | | | | | | Merge "Remove STOPSHIP in WifiWatchdogStateMachine" into klp-devYuhao Zheng2013-09-191-6/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove STOPSHIP in WifiWatchdogStateMachineYuhao Zheng2013-09-191-6/+1
* | | | | | | | | | | | | | Merge "Debug for b/10689184." into klp-devCraig Mautner2013-09-192-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Debug for b/10689184.Craig Mautner2013-09-192-6/+5
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Increasing visibility of pressed feedback for default ui widget assets...petergng@google.com2013-09-19244-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Increasing visibility of pressed feedback for default ui widget assetspetergng@google.com2013-09-19244-0/+0
* | | | | | | | | | | | | Merge "Return tasks in correct order." into klp-devCraig Mautner2013-09-193-6/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Return tasks in correct order.Craig Mautner2013-09-193-6/+42
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Support for "not the home app you're looking for" metadata" into klp-devChristopher Tate2013-09-193-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Support for "not the home app you're looking for" metadataChristopher Tate2013-09-193-1/+10
* | | | | | | | | | | | | | Merge "Bar gradients now 55% to 0% black." into klp-devJohn Spurlock2013-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Bar gradients now 55% to 0% black.John Spurlock2013-09-191-1/+1
* | | | | | | | | | | | | | Merge "Use a separate thread for services that do NTP lookup" into klp-devAmith Yamasani2013-09-193-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use a separate thread for services that do NTP lookupAmith Yamasani2013-09-193-6/+12
* | | | | | | | | | | | | | | Merge "Also catch one more tablet layout NPE." into klp-devJeff Sharkey2013-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Also catch one more tablet layout NPE.Jeff Sharkey2013-09-191-1/+1
* | | | | | | | | | | | | | | Merge "Fix tablet layout and resources." into klp-devJeff Sharkey2013-09-194-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix tablet layout and resources.Jeff Sharkey2013-09-194-1/+1
* | | | | | | | | | | | | | Merge "Update SkTypeface::CreateFromName to handle NULL if familyName does no...Derek Sollenberger2013-09-191-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Update SkTypeface::CreateFromName to handle NULL if familyName does not matchDerek Sollenberger2013-09-191-5/+7
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-1957-69/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \