summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-devAdam Lesinski2014-10-031-20/+26
|\
| * AAPT: Gate v21 resource synthesizing logging behind -v flagAdam Lesinski2014-10-031-20/+26
* | Revert "TouchExplorer computes incorrectly the click location."Svetoslav Ganov2014-10-032-32/+108
* | Merge "Minor style changes." into lmp-devDeepanshu Gupta2014-10-031-3/+3
|\ \
| * | Minor style changes.Deepanshu Gupta2014-10-021-3/+3
* | | Merge "Fix issue #17811029: Settings provider race when removing users" into ...Dianne Hackborn2014-10-031-3/+15
|\ \ \
| * | | Fix issue #17811029: Settings provider race when removing usersDianne Hackborn2014-10-031-3/+15
* | | | Merge "Fix regression in RCC.editMetadata(false)" into lmp-devRoboErik2014-10-031-1/+2
|\ \ \ \
| * | | | Fix regression in RCC.editMetadata(false)RoboErik2014-10-031-1/+2
* | | | | Merge "Fix alarm delivery-order sorting" into lmp-devChristopher Tate2014-10-031-6/+73
|\ \ \ \ \
| * | | | | Fix alarm delivery-order sortingChristopher Tate2014-10-031-6/+73
* | | | | | Merge "Prevent monkey from triggering bugreport" into lmp-devGuang Zhu2014-10-031-0/+6
|\ \ \ \ \ \
| * | | | | | Prevent monkey from triggering bugreportGuang Zhu2014-10-031-0/+6
* | | | | | | Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...Dianne Hackborn2014-10-031-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | am 1242af06: am 32cfe2bb: am d37afa37: Merge "docs: Unbuntu troubleshooting l...Ricardo Cervera2014-10-031-4/+4
|\ \ \ \ \ \
| * \ \ \ \ \ am 32cfe2bb: am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelC...Ricardo Cervera2014-10-031-4/+4
| |\ \ \ \ \ \
| | * \ \ \ \ \ am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into ...Ricardo Cervera2014-10-031-4/+4
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docsRicardo Cervera2014-10-031-4/+4
| | | |\ \ \ \ \ \
| | | | * | | | | | docs: Unbuntu troubleshooting link to CamelCase IDRicardo Cervera2014-10-031-4/+4
* | | | | | | | | | Merge "Send callbacks for Net property changes" into lmp-devRobert Greenwalt2014-10-032-57/+64
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Send callbacks for Net property changesRobert Greenwalt2014-10-022-57/+64
* | | | | | | | | | | Merge "Update framework icons for media & alarm streams." into lmp-devJohn Spurlock2014-10-0337-79/+190
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update framework icons for media & alarm streams.John Spurlock2014-10-0237-79/+190
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Disable notification effects during phone calls." into lmp-devJohn Spurlock2014-10-033-7/+50
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Disable notification effects during phone calls.John Spurlock2014-10-023-7/+50
| |/ / / / / / / / / /
* | | | | | | | | | | Merge "Revert "Revert "Frameworks/base: Update to preloaded-classes""" into l...Andreas Gampe2014-10-031-554/+822
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "Revert "Frameworks/base: Update to preloaded-classes""Andreas Gampe2014-10-021-554/+822
* | | | | | | | | | | | Merge "Send updated NetworkAgent score to NetworkFactories when validated." i...Paul Jensen2014-10-031-26/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Send updated NetworkAgent score to NetworkFactories when validated.Paul Jensen2014-10-021-26/+39
* | | | | | | | | | | | | Merge "Allow any unvalidated Network to satisfy NetworkRequests." into lmp-devPaul Jensen2014-10-031-20/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Allow any unvalidated Network to satisfy NetworkRequests.Paul Jensen2014-10-021-20/+34
* | | | | | | | | | | | Merge "Maybe fix issue #17449495: Nakasi is pretty laggy/slow to do anything"...Dianne Hackborn2014-10-031-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Maybe fix issue #17449495: Nakasi is pretty laggy/slow to do anythingDianne Hackborn2014-10-021-5/+9
* | | | | | | | | | | | Merge "Fix theme propagation to contained android:drawable elements" into lmp...Alan Viverette2014-10-029-10/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix theme propagation to contained android:drawable elementsAlan Viverette2014-10-029-10/+14
* | | | | | | | | | | | | Merge "Add @SystemApi to missing TelecomManager methods" into lmp-devEvan Charlton2014-10-021-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add @SystemApi to missing TelecomManager methodsEvan Charlton2014-10-021-0/+3
* | | | | | | | | | | | | | am 721b3efc: am 46d8d0cd: am c470faab: docs:ADT 23.0.4 doc updatesRich Slogar2014-10-022-4/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 46d8d0cd: am c470faab: docs:ADT 23.0.4 doc updatesRich Slogar2014-10-022-4/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am c470faab: docs:ADT 23.0.4 doc updatesRich Slogar2014-10-022-4/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | docs:ADT 23.0.4 doc updatesRich Slogar2014-10-022-4/+39
* | | | | | | | | | | | | | Merge "SDK only: Update docs to reflect current implementation." into lmp-devDianne Hackborn2014-10-021-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | SDK only: Update docs to reflect current implementation.Dianne Hackborn2014-10-021-2/+6
* | | | | | | | | | | | | | | Merge "Synchronize on all sendProxyBroadcast calls" into lmp-devJason Monk2014-10-021-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Synchronize on all sendProxyBroadcast callsJason Monk2014-10-021-5/+5
* | | | | | | | | | | | | | | Merge "Fix race in RecognizerService teardown." into lmp-devJeff Brown2014-10-021-11/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix race in RecognizerService teardown.Jeff Brown2014-10-021-11/+19
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | am 285859b1: am d36dbe09: am e961d0b5: Merge "Revert "docs: Update for Androi...Joe Fernandez2014-10-024-80/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am d36dbe09: am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" in...Joe Fernandez2014-10-024-80/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modula...Joe Fernandez2014-10-024-80/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / | | | |/| | | | | | | | | | |