summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 0c0d6052: am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for me...Elliott Hughes2012-09-0652-104/+4
|\
| * am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f861...Elliott Hughes2012-09-0652-104/+4
| |\
| | * am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-a...Elliott Hughes2012-09-0652-104/+4
| | |\
| | | * am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-masterElliott Hughes2012-09-0652-104/+4
| | | |\
| | | | * resolved conflicts for merge of 33f86196 to stage-aosp-masterElliott Hughes2012-09-0652-104/+4
| | | | |\
| | | | | * Merge "Stop hard-coding sample 12- and 24-hour times."Elliott Hughes2012-09-0652-104/+4
| | | | | |\
| | | | | | * Stop hard-coding sample 12- and 24-hour times.Elliott Hughes2012-09-0652-104/+4
| | | | | |/
* | | | | | am 2c705626: (-s ours) am d4e216bc: Merge "Revert "Import translations. DO NO...Baligh Uddin2012-09-060-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d4e216bc: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-devBaligh Uddin2012-09-0698-1286/+1332
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-devBaligh Uddin2012-09-0698-1286/+1332
| | |\ \ \ \
| | | * | | | Revert "Import translations. DO NOT MERGE"Baligh Uddin2012-09-0698-1286/+1332
* | | | | | | Merge "Revert "Import translations. DO NOT MERGE""Baligh Uddin2012-09-0698-1153/+823
|\ \ \ \ \ \ \
| * | | | | | | Revert "Import translations. DO NOT MERGE"Baligh Uddin2012-09-0698-1153/+823
* | | | | | | | am 237882f1: (-s ours) am d2dec8c7: Merge "Import translations. DO NOT MERGE"...Baligh Uddin2012-09-060-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am d2dec8c7: Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-09-0698-1332/+1286
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-09-0698-1332/+1286
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-0598-1332/+1286
* | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-09-0698-823/+1153
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-0598-823/+1153
* | | | | | | | am daed50bd: (-s ours) am 710aeba1: am c53ce268: (-s ours) Reconcile with jb-...The Android Open Source Project2012-09-060-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 710aeba1: am c53ce268: (-s ours) Reconcile with jb-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am c53ce268: (-s ours) Reconcile with jb-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Reconcile with jb-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-08-290-0/+0
| | | | |\ \ \ \
| | | | | * \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-08-290-0/+0
| | | | | |\ \ \ \ | | | | | |/ / / / | | | | |/| | | |
* | | | | | | | | am f3541a5f: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-060-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-050-0/+0
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-040-0/+0
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-030-0/+0
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-300-0/+0
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-290-0/+0
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-280-0/+0
| | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-270-0/+0
| | | | | | | | | |\ \ \ \ \ \ \
* | | | | | | | | | \ \ \ \ \ \ \ am 5998c8ae: am ee04e472: Merge "Add content descriptions to power control wi...Charles Chen2012-09-052-0/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am ee04e472: Merge "Add content descriptions to power control widget." into j...Charles Chen2012-09-052-0/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge "Add content descriptions to power control widget." into jb-mr1-devCharles Chen2012-09-052-0/+77
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Add content descriptions to power control widget.alanv2012-08-302-0/+77
| | | | |_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | | am fb2a89c6: am 1537e8b3: Dream settings: list items back to constant heightJohn Spurlock2012-09-054-79/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 1537e8b3: Dream settings: list items back to constant heightJohn Spurlock2012-09-054-79/+92
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Dream settings: list items back to constant heightJohn Spurlock2012-09-054-79/+92
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | am 0aeb8f2e: am 952146ee: Merge "Clear profile connnection status of bonded d...Matthew Xie2012-09-042-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 952146ee: Merge "Clear profile connnection status of bonded devices when B...Matthew Xie2012-09-042-0/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge "Clear profile connnection status of bonded devices when BT is turned o...Matthew Xie2012-09-042-0/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Clear profile connnection status of bonded devices when BT is turned offGanesh Ganapathi Batta2012-09-042-0/+20
| | | | |/ / / / / / / / / | | | |/| | | | | | | | |
* | | | | | | | | | | | | am 6b329db9: am 22dc1fe2: Make TTS languages list sorted.Przemyslaw Szczepaniak2012-09-031-9/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 22dc1fe2: Make TTS languages list sorted.Przemyslaw Szczepaniak2012-09-031-9/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Make TTS languages list sorted.Przemyslaw Szczepaniak2012-09-031-9/+32
| | |/ / / / / / / / / /
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-08-3149-322/+240
|\ \ \ \ \ \ \ \ \ \ \ \