Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 09d8e3cf: am c68bb182: Merge "SyncManager now returns copy on getCurrentSy... | Matthew Williams | 2013-11-14 | 3 | -9/+37 |
|\ | |||||
| * | am c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into k... | Matthew Williams | 2013-11-14 | 3 | -9/+37 |
| |\ | |||||
| | * | Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev | Matthew Williams | 2013-11-14 | 3 | -9/+37 |
| | |\ | |||||
| | | * | SyncManager now returns copy on getCurrentSyncs() | Matthew Williams | 2013-11-13 | 3 | -9/+37 |
* | | | | am 3f6d9630: am 34aab81a: Merge "add information about required meta-data for... | Scott Main | 2013-11-13 | 1 | -0/+18 |
|\ \ \ \ | |/ / / | |||||
| * | | | am 34aab81a: Merge "add information about required meta-data for gcore bug: 1... | Scott Main | 2013-11-14 | 1 | -0/+18 |
| |\ \ \ | |||||
| | * \ \ | Merge "add information about required meta-data for gcore bug: 11553131" into... | Scott Main | 2013-11-14 | 1 | -0/+18 |
| | |\ \ \ | |||||
| | | * | | | add information about required meta-data for gcore | Scott Main | 2013-11-13 | 1 | -0/+18 |
* | | | | | | am 1b570b57: am 5fd5aa3d: Fix compatibility issue on InputMethodSubtype | Satoshi Kataoka | 2013-11-13 | 1 | -0/+7 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 5fd5aa3d: Fix compatibility issue on InputMethodSubtype | Satoshi Kataoka | 2013-11-13 | 1 | -0/+7 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Fix compatibility issue on InputMethodSubtype | Satoshi Kataoka | 2013-11-14 | 1 | -0/+7 |
* | | | | | | am 94be0049: am 4863e686: Merge "[DO NOT MERGE] Improve documentation for Inp... | Jean Chalard | 2013-11-13 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 4863e686: Merge "[DO NOT MERGE] Improve documentation for InputType and Ed... | Jean Chalard | 2013-11-14 | 0 | -0/+0 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge "[DO NOT MERGE] Improve documentation for InputType and EditorInfo." in... | Jean Chalard | 2013-11-14 | 3 | -64/+134 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | [DO NOT MERGE] Improve documentation for InputType and EditorInfo. | Jean Chalard | 2013-11-13 | 3 | -64/+134 |
* | | | | | | am 75ae8983: am 48d2bcf2: Reset padding flags when set programmatically or im... | Adam Powell | 2013-11-13 | 1 | -4/+18 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 48d2bcf2: Reset padding flags when set programmatically or implicitly from... | Adam Powell | 2013-11-13 | 1 | -4/+18 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Reset padding flags when set programmatically or implicitly from background | Adam Powell | 2013-11-13 | 1 | -4/+18 |
* | | | | | | am 5305fe3f: am 39af5a78: Merge "Don\'t set up external displays from binder ... | Jim Miller | 2013-11-13 | 1 | -1/+8 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 39af5a78: Merge "Don\'t set up external displays from binder thread" into ... | Jim Miller | 2013-11-13 | 1 | -1/+8 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "Don't set up external displays from binder thread" into klp-dev | Jim Miller | 2013-11-14 | 1 | -1/+8 |
| | |\ \ \ \ | |||||
| | | * | | | | Don't set up external displays from binder thread | Jim Miller | 2013-11-13 | 1 | -1/+8 |
* | | | | | | | am fe666e84: am 4e041150: Merge "Avoid NPE and add a warning log if a printin... | Svetoslav | 2013-11-13 | 1 | -0/+30 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 4e041150: Merge "Avoid NPE and add a warning log if a printing app misbeha... | Svetoslav | 2013-11-13 | 1 | -0/+30 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge "Avoid NPE and add a warning log if a printing app misbehaves." into kl... | Svetoslav | 2013-11-14 | 1 | -0/+30 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Avoid NPE and add a warning log if a printing app misbehaves. | Svetoslav | 2013-11-13 | 1 | -0/+30 |
| | | |/ / / / | |||||
* | | | | | | | am 378c804d: am c8867b28: Merge "Report keyguard as initially showing and sec... | Jim Miller | 2013-11-13 | 2 | -1/+12 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am c8867b28: Merge "Report keyguard as initially showing and secure until we ... | Jim Miller | 2013-11-13 | 2 | -1/+12 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge "Report keyguard as initially showing and secure until we know" into kl... | Jim Miller | 2013-11-14 | 2 | -1/+12 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Report keyguard as initially showing and secure until we know | Jim Miller | 2013-11-13 | 2 | -1/+12 |
| | | | |_|_|/ | | | |/| | | | |||||
* | | | | | | | resolved conflicts for merge of ec9e8933 to klp-dev-plus-aosp | Robert Greenwalt | 2013-11-13 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | am 3b9244b4: Merge "Fix for the invalid Global Proxy Setting" | Robert Greenwalt | 2013-11-13 | 3 | -0/+31 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge "Fix for the invalid Global Proxy Setting" | Robert Greenwalt | 2013-11-14 | 3 | -0/+31 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Fix for the invalid Global Proxy Setting | Raj Mamadgi | 2013-11-12 | 3 | -0/+31 |
* | | | | | | | | | | am 1b21665b: am c32d89f6: Merge "Replace keyboard sounds with latest (softer)... | Glenn Kasten | 2013-11-13 | 2 | -10/+10 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | am c32d89f6: Merge "Replace keyboard sounds with latest (softer) design" into... | Glenn Kasten | 2013-11-13 | 2 | -10/+10 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge "Replace keyboard sounds with latest (softer) design" into klp-dev | Glenn Kasten | 2013-11-14 | 2 | -10/+10 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Replace keyboard sounds with latest (softer) design | Glenn Kasten | 2013-11-13 | 2 | -10/+10 |
* | | | | | | | | | | | am daf21d76: am 75c12de0: Merge "Increase Reject threshold for disabling netw... | Vinit Deshapnde | 2013-11-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 75c12de0: Merge "Increase Reject threshold for disabling networks" into kl... | Vinit Deshapnde | 2013-11-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "Increase Reject threshold for disabling networks" into klp-dev | Vinit Deshapnde | 2013-11-14 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Increase Reject threshold for disabling networks | Vinit Deshapnde | 2013-11-13 | 1 | -1/+1 |
* | | | | | | | | | | | | am 1197bc37: am 7e11b16b: VideoView: expand documentation on state save/resto... | Lajos Molnar | 2013-11-13 | 1 | -1/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | am 7e11b16b: VideoView: expand documentation on state save/restore limitations | Lajos Molnar | 2013-11-13 | 1 | -1/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | VideoView: expand documentation on state save/restore limitations | Lajos Molnar | 2013-11-13 | 1 | -1/+11 |
* | | | | | | | | | | | | am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" in... | Robert Greenwalt | 2013-11-13 | 3 | -0/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev | Robert Greenwalt | 2013-11-13 | 3 | -0/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Merge "Fix for the invalid Global Proxy Setting" into klp-dev | Robert Greenwalt | 2013-11-14 | 3 | -0/+32 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Fix for the invalid Global Proxy Setting | Raj Mamadgi | 2013-11-14 | 3 | -0/+32 |
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | |||||
* | | | | | | | | | | | | am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into klp-dev | Craig Mautner | 2013-11-13 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |