Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 72402f9d: am 09d8e3cf: am c68bb182: Merge "SyncManager now returns copy on... | Matthew Williams | 2013-11-14 | 2 | -9/+29 |
|\ | |||||
| * | am 09d8e3cf: am c68bb182: Merge "SyncManager now returns copy on getCurrentSy... | Matthew Williams | 2013-11-14 | 2 | -9/+29 |
| |\ | |||||
| | * | Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev | Matthew Williams | 2013-11-14 | 2 | -9/+29 |
| | |\ | |||||
| | | * | SyncManager now returns copy on getCurrentSyncs() | Matthew Williams | 2013-11-13 | 2 | -9/+29 |
* | | | | am 7fdfe28c: am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Prox... | Robert Greenwalt | 2013-11-13 | 2 | -0/+21 |
|\ \ \ \ | |/ / / | |||||
| * | | | am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" in... | Robert Greenwalt | 2013-11-13 | 2 | -0/+21 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge "Fix for the invalid Global Proxy Setting" into klp-dev | Robert Greenwalt | 2013-11-14 | 2 | -0/+21 |
| | |\ \ | |||||
| | | * | | Fix for the invalid Global Proxy Setting | Raj Mamadgi | 2013-11-14 | 2 | -0/+21 |
* | | | | | am 1fbb5da2: am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into k... | Craig Mautner | 2013-11-13 | 2 | -2/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into klp-dev | Craig Mautner | 2013-11-13 | 1 | -1/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "Add null pointer check." into klp-dev | Craig Mautner | 2013-11-14 | 1 | -1/+3 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Add null pointer check. | Craig Mautner | 2013-11-13 | 1 | -1/+3 |
| * | | | | am ef1dd26e: am 0e823a45: Merge "Keyguard isn\'t visible if it hasn\'t been d... | Craig Mautner | 2013-11-13 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "Keyguard isn't visible if it hasn't been drawn." into klp-dev | Craig Mautner | 2013-11-13 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Keyguard isn't visible if it hasn't been drawn. | Craig Mautner | 2013-11-13 | 1 | -1/+1 |
| | | |/ / | |||||
* | | | | | am 87b84ca6: am e995ad15: am 0b2c2b10: Merge "Support preferred activities wi... | Christopher Tate | 2013-11-13 | 1 | -26/+20 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am e995ad15: am 0b2c2b10: Merge "Support preferred activities with zero or on... | Christopher Tate | 2013-11-13 | 1 | -26/+20 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "Support preferred activities with zero or one scheme in the filter" in... | Christopher Tate | 2013-11-13 | 1 | -26/+20 |
| | |\ \ \ | |||||
| | | * | | | Support preferred activities with zero or one scheme in the filter | Christopher Tate | 2013-11-12 | 1 | -26/+20 |
* | | | | | | am c4f535bd: am 299e011e: am 54ca9066: Merge "Get rid of a race in NsdService... | John Huang | 2013-11-13 | 1 | -2/+6 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 299e011e: am 54ca9066: Merge "Get rid of a race in NsdService in stopResol... | John Huang | 2013-11-13 | 1 | -2/+6 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo"... | John Huang | 2013-11-13 | 1 | -2/+6 |
| | |\ \ \ \ | |||||
| | | * | | | | Get rid of a race in NsdService in stopResolveService and getAddrInfo | Vinit Deshapnde | 2013-11-12 | 1 | -2/+6 |
* | | | | | | | am 955b575d: am 6eddb39c: am 18490abd: Merge "Fix NPE in ConnectivityService" | Robert Greenwalt | 2013-11-13 | 1 | -2/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 6eddb39c: am 18490abd: Merge "Fix NPE in ConnectivityService" | Robert Greenwalt | 2013-11-13 | 1 | -2/+5 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | am 18490abd: Merge "Fix NPE in ConnectivityService" | Robert Greenwalt | 2013-11-13 | 1 | -2/+5 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge "Fix NPE in ConnectivityService" | Robert Greenwalt | 2013-11-13 | 1 | -2/+5 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Fix NPE in ConnectivityService | Ken Mixter | 2013-11-12 | 1 | -2/+5 |
* | | | | | | | | | | am e5ae0bfd: am a20f625c: am 41b92b00: Merge "Finalize assets for screen cast... | Jeff Brown | 2013-11-13 | 3 | -23/+83 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am a20f625c: am 41b92b00: Merge "Finalize assets for screen casting." into kl... | Jeff Brown | 2013-11-13 | 3 | -23/+83 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge "Finalize assets for screen casting." into klp-dev | Jeff Brown | 2013-11-13 | 3 | -23/+83 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Finalize assets for screen casting. | Jeff Brown | 2013-11-13 | 3 | -23/+83 |
* | | | | | | | | | | | am e86ab5e1: am 79033da8: am 7d667ee2: Merge "Ensure wallpaper hint is at lea... | John Spurlock | 2013-11-13 | 1 | -4/+15 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 79033da8: am 7d667ee2: Merge "Ensure wallpaper hint is at least as large a... | John Spurlock | 2013-11-13 | 1 | -4/+15 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev | John Spurlock | 2013-11-13 | 1 | -4/+15 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | Ensure wallpaper hint is at least as large as the display. | John Spurlock | 2013-11-12 | 1 | -4/+15 |
* | | | | | | | | | | | Merge commit 'bf581034' into manualmerge | Craig Mautner | 2013-11-12 | 3 | -6/+13 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 679ba4e8: am 6cd206b2: Merge "Relayout windows that handle their own confi... | Craig Mautner | 2013-11-12 | 3 | -6/+13 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "Relayout windows that handle their own config change." into klp-dev | Craig Mautner | 2013-11-12 | 3 | -6/+13 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | Relayout windows that handle their own config change. | Craig Mautner | 2013-11-12 | 3 | -6/+13 |
| | | |/ / / / / / / | |||||
* | | | | | | | | | | resolved conflicts for merge of d6288751 to master | Elliott Hughes | 2013-11-12 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 22108007: am 01e42c0b: Merge "Fix libinput to build with uapi headers." | Elliott Hughes | 2013-11-12 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | am 01e42c0b: Merge "Fix libinput to build with uapi headers." | Elliott Hughes | 2013-11-12 | 1 | -0/+6 |
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | Fix libinput to build with uapi headers. | Elliott Hughes | 2013-11-12 | 1 | -0/+6 |
| | | | |_|/ / / / | | | |/| | | | | | |||||
| | * | | | | | | | am 91135202: Merge "Always initialize local boolean variables when possible" | Elliott Hughes | 2013-10-29 | 1 | -9/+6 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Always initialize local boolean variables when possible | Michael Wright | 2013-10-29 | 1 | -9/+6 |
* | | | | | | | | | am 8a71cdae: am f174b516: am 48dab493: Merge "Fix inconsistency in reporting ... | Amith Yamasani | 2013-11-12 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am f174b516: am 48dab493: Merge "Fix inconsistency in reporting device admin ... | Amith Yamasani | 2013-11-12 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge "Fix inconsistency in reporting device admin active state." into klp-dev | Amith Yamasani | 2013-11-12 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | | * | | | | | | Fix inconsistency in reporting device admin active state. | Amith Yamasani | 2013-11-11 | 1 | -0/+1 |