summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | am eaf1b227: Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
|\ \ \ \ | |/ / /
| * | | Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-110-0/+0
| | |\ \ | | | |/ | | |/|
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-080-0/+0
| | | |\
* | | | \ am 7fe56c46: (-s ours) am bce32b5e: Import translations. DO NOT MERGEEric Fischer2012-06-080-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am bce32b5e: Import translations. DO NOT MERGEEric Fischer2012-06-082-9/+8
| |\ \ \ \ | | |/ / /
| | * | | Import translations. DO NOT MERGEEric Fischer2012-06-082-9/+8
| | |/ /
* | | | am d694d07b: (-s ours) am c1b34cec: Import translations. DO NOT MERGEEric Fischer2012-06-070-0/+0
|\ \ \ \ | |/ / /
| * | | am c1b34cec: Import translations. DO NOT MERGEEric Fischer2012-06-072-2/+2
| |\ \ \ | | |/ /
| | * | Import translations. DO NOT MERGEEric Fischer2012-06-072-2/+2
* | | | Import translations. DO NOT MERGEEric Fischer2012-06-072-2/+2
* | | | am 65cf68da: Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
|\ \ \ \ | |/ / /
| * | | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-070-0/+0
| | |\ \ | | | |/ | | |/|
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-060-0/+0
| | | |\
| | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-050-0/+0
| | | | |\
| | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-030-0/+0
| | | | | |\
| | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-310-0/+0
| | | | | | |\
* | | | | | | \ am fef4b82c: am 59b6bb0b: Merge "Don\'t assume Bluetooth is present." into jb...Martijn Coenen2012-06-062-6/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 59b6bb0b: Merge "Don\'t assume Bluetooth is present." into jb-devMartijn Coenen2012-06-062-6/+24
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Don't assume Bluetooth is present." into jb-devMartijn Coenen2012-06-062-6/+24
| | |\ \ \ \ \ \
| | | * | | | | | Don't assume Bluetooth is present.Martijn Coenen2012-06-062-6/+24
| | | |/ / / / /
* | | | | | | | am c55ca83f: (-s ours) am 7a0c3948: Import translations. DO NOT MERGEEric Fischer2012-06-060-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 7a0c3948: Import translations. DO NOT MERGEEric Fischer2012-06-061-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-061-1/+1
| | |/ / / / /
* | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-061-1/+1
* | | | | | | am 847cec06: (-s ours) am 450be298: Import translations. DO NOT MERGEEric Fischer2012-06-050-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 450be298: Import translations. DO NOT MERGEEric Fischer2012-06-052-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Import translations. DO NOT MERGEEric Fischer2012-06-052-2/+2
| | |/ / / /
* | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-052-2/+2
* | | | | | am 066cd6df: (-s ours) am f6686c27: Import translations. DO NOT MERGEEric Fischer2012-06-050-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am f6686c27: Import translations. DO NOT MERGEEric Fischer2012-06-043-25/+13
| |\ \ \ \ \ | | |/ / / /
| | * | | | Import translations. DO NOT MERGEEric Fischer2012-06-043-25/+13
| | |/ / /
* | | | | Import translations. DO NOT MERGEEric Fischer2012-06-043-25/+13
* | | | | am 180562b0: (-s ours) am 24bd050e: Import translations. DO NOT MERGEEric Fischer2012-06-010-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 24bd050e: Import translations. DO NOT MERGEEric Fischer2012-06-0136-258/+129
| |\ \ \ \ | | |/ / /
| | * | | Import translations. DO NOT MERGEEric Fischer2012-06-0136-258/+129
* | | | | Import translations. DO NOT MERGEEric Fischer2012-06-0136-258/+129
* | | | | am d560e24e: am f4392711: Add watchdog to applyRouting().Martijn Coenen2012-05-311-46/+53
|\ \ \ \ \ | |/ / / /
| * | | | am f4392711: Add watchdog to applyRouting().Martijn Coenen2012-05-311-46/+53
| |\ \ \ \ | | |/ / /
| | * | | Add watchdog to applyRouting().Martijn Coenen2012-05-311-46/+53
* | | | | am 72b19e1f: (-s ours) am 5c1c4487: Import translations. DO NOT MERGEEric Fischer2012-05-310-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 5c1c4487: Import translations. DO NOT MERGEEric Fischer2012-05-3115-93/+47
| |\ \ \ \ | | |/ / /
| | * | | Import translations. DO NOT MERGEEric Fischer2012-05-3115-93/+47
| | |/ /
* | | | Import translations. DO NOT MERGEEric Fischer2012-05-3115-93/+47
* | | | am f7f7996c: (-s ours) am 932c012a: Import translations. DO NOT MERGEEric Fischer2012-05-300-0/+0
|\ \ \ \ | |/ / /
| * | | am 932c012a: Import translations. DO NOT MERGEEric Fischer2012-05-3017-184/+92
| |\ \ \ | | |/ /
| | * | Import translations. DO NOT MERGEEric Fischer2012-05-3017-184/+92
* | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-05-3017-184/+92
|\ \ \ \
| * | | | Import translations. DO NOT MERGEEric Fischer2012-05-3017-184/+92