Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 0c0d6052: am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for me... | Elliott Hughes | 2012-09-06 | 52 | -104/+4 |
|\ | |||||
| * | am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f861... | Elliott Hughes | 2012-09-06 | 52 | -104/+4 |
| |\ | |||||
| | * | am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-a... | Elliott Hughes | 2012-09-06 | 52 | -104/+4 |
| | |\ | |||||
| | | * | am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master | Elliott Hughes | 2012-09-06 | 52 | -104/+4 |
| | | |\ | |||||
| | | | * | resolved conflicts for merge of 33f86196 to stage-aosp-master | Elliott Hughes | 2012-09-06 | 52 | -104/+4 |
| | | | |\ | |||||
| | | | | * | Merge "Stop hard-coding sample 12- and 24-hour times." | Elliott Hughes | 2012-09-06 | 52 | -104/+4 |
| | | | | |\ | |||||
| | | | | | * | Stop hard-coding sample 12- and 24-hour times. | Elliott Hughes | 2012-09-06 | 52 | -104/+4 |
| | | | | |/ | |||||
* | | | | | | am 2c705626: (-s ours) am d4e216bc: Merge "Revert "Import translations. DO NO... | Baligh Uddin | 2012-09-06 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am d4e216bc: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev | Baligh Uddin | 2012-09-06 | 98 | -1286/+1332 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev | Baligh Uddin | 2012-09-06 | 98 | -1286/+1332 |
| | |\ \ \ \ | |||||
| | | * | | | | Revert "Import translations. DO NOT MERGE" | Baligh Uddin | 2012-09-06 | 98 | -1286/+1332 |
* | | | | | | | Merge "Revert "Import translations. DO NOT MERGE"" | Baligh Uddin | 2012-09-06 | 98 | -1153/+823 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Revert "Import translations. DO NOT MERGE" | Baligh Uddin | 2012-09-06 | 98 | -1153/+823 |
* | | | | | | | | am 237882f1: (-s ours) am d2dec8c7: Merge "Import translations. DO NOT MERGE"... | Baligh Uddin | 2012-09-06 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am d2dec8c7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev | Baligh Uddin | 2012-09-06 | 98 | -1332/+1286 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-dev | Baligh Uddin | 2012-09-06 | 98 | -1332/+1286 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2012-09-05 | 98 | -1332/+1286 |
* | | | | | | | | Merge "Import translations. DO NOT MERGE" | Baligh Uddin | 2012-09-06 | 98 | -823/+1153 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2012-09-05 | 98 | -823/+1153 |
* | | | | | | | | am daed50bd: (-s ours) am 710aeba1: am c53ce268: (-s ours) Reconcile with jb-... | The Android Open Source Project | 2012-09-06 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am 710aeba1: am c53ce268: (-s ours) Reconcile with jb-release - do not merge | The Android Open Source Project | 2012-09-06 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | am c53ce268: (-s ours) Reconcile with jb-release - do not merge | The Android Open Source Project | 2012-09-06 | 0 | -0/+0 |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | |||||
| | | * | | | | | Reconcile with jb-release - do not merge | The Android Open Source Project | 2012-09-06 | 0 | -0/+0 |
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | | | * | | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-08-29 | 0 | -0/+0 |
| | | | |\ \ \ \ | |||||
| | | | | * \ \ \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-08-29 | 0 | -0/+0 |
| | | | | |\ \ \ \ | | | | | |/ / / / | | | | |/| | | | | |||||
* | | | | | | | | | am f3541a5f: (-s ours) Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-09-06 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-09-06 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-06 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | | * | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-05 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-04 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-03 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-30 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-29 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | * \ \ \ \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-28 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-27 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ \ \ \ | |||||
* | | | | | | | | | \ \ \ \ \ \ \ | am 5998c8ae: am ee04e472: Merge "Add content descriptions to power control wi... | Charles Chen | 2012-09-05 | 2 | -0/+77 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | am ee04e472: Merge "Add content descriptions to power control widget." into j... | Charles Chen | 2012-09-05 | 2 | -0/+77 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | Merge "Add content descriptions to power control widget." into jb-mr1-dev | Charles Chen | 2012-09-05 | 2 | -0/+77 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Add content descriptions to power control widget. | alanv | 2012-08-30 | 2 | -0/+77 |
| | | | |_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | am fb2a89c6: am 1537e8b3: Dream settings: list items back to constant height | John Spurlock | 2012-09-05 | 4 | -79/+92 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | am 1537e8b3: Dream settings: list items back to constant height | John Spurlock | 2012-09-05 | 4 | -79/+92 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | Dream settings: list items back to constant height | John Spurlock | 2012-09-05 | 4 | -79/+92 |
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | am 0aeb8f2e: am 952146ee: Merge "Clear profile connnection status of bonded d... | Matthew Xie | 2012-09-04 | 2 | -0/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | am 952146ee: Merge "Clear profile connnection status of bonded devices when B... | Matthew Xie | 2012-09-04 | 2 | -0/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | Merge "Clear profile connnection status of bonded devices when BT is turned o... | Matthew Xie | 2012-09-04 | 2 | -0/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Clear profile connnection status of bonded devices when BT is turned off | Ganesh Ganapathi Batta | 2012-09-04 | 2 | -0/+20 |
| | | | |/ / / / / / / / / | | | |/| | | | | | | | | | |||||
* | | | | | | | | | | | | | am 6b329db9: am 22dc1fe2: Make TTS languages list sorted. | Przemyslaw Szczepaniak | 2012-09-03 | 1 | -9/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | am 22dc1fe2: Make TTS languages list sorted. | Przemyslaw Szczepaniak | 2012-09-03 | 1 | -9/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Make TTS languages list sorted. | Przemyslaw Szczepaniak | 2012-09-03 | 1 | -9/+32 |
| | |/ / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" | Baligh Uddin | 2012-08-31 | 49 | -322/+240 |
|\ \ \ \ \ \ \ \ \ \ \ \ |