summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 64f745b6: Merge "Make locale safe paths"tools_r21Martijn Coenen2012-10-041-1/+2
|\
| * Merge "Make locale safe paths"Martijn Coenen2012-10-041-1/+2
| |\
| | * Make locale safe pathsJohan Redestig2012-10-031-1/+2
| |/
* | Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-270-0/+0
|\ \
| * \ merge in jb-mr0-release history after reset to jb-devandroid-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1jb-mr0-releaseThe Android Automerger2012-07-260-0/+0
| |\ \
* | | | am 43f22631: Fix type of collision resolution record.Martijn Coenen2012-07-251-1/+3
|\| | |
| * | | Fix type of collision resolution record.android-cts-4.1_r4android-cts-4.1_r2jb-devMartijn Coenen2012-07-251-1/+3
* | | | am 327d0e7c: Implement connection handover LLCP service.Martijn Coenen2012-07-256-7/+414
|\| | | | |_|/ |/| |
| * | Implement connection handover LLCP service.Martijn Coenen2012-07-256-7/+414
* | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ | | |/ | |/|
| * | merge in jb-release history after reset to jb-devandroid-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1jb-releaseThe Android Automerger2012-06-190-0/+0
| |\ \ | | |/ | |/|
* | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ | | |/ | |/|
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-140-0/+0
| |\ \
* | \ \ am e926ef2b: Import translations. DO NOT MERGEYing Wang2012-06-181-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Import translations. DO NOT MERGEandroid-cts-4.1_r1Ying Wang2012-06-181-1/+1
| |/ /
* | | am b725b483: Import translations. DO NOT MERGEEric Fischer2012-06-131-1/+1
|\| |
| * | Import translations. DO NOT MERGEEric Fischer2012-06-131-1/+1
* | | 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 bce32b5e: Import translations. DO NOT MERGEEric Fischer2012-06-082-9/+8
|\| | |
| * | | Import translations. DO NOT MERGEEric Fischer2012-06-082-9/+8
| |/ /
* | | am c1b34cec: Import translations. DO NOT MERGEEric Fischer2012-06-072-2/+2
|\| |
| * | Import translations. DO NOT MERGEEric Fischer2012-06-072-2/+2
* | | 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 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 7a0c3948: Import translations. DO NOT MERGEEric Fischer2012-06-061-1/+1
|\| | | | | |
| * | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-061-1/+1
| |/ / / / /
* | | | | | am 450be298: Import translations. DO NOT MERGEEric Fischer2012-06-052-2/+2
|\| | | | |
| * | | | | Import translations. DO NOT MERGEEric Fischer2012-06-052-2/+2
| |/ / / /
* | | | | am f6686c27: Import translations. DO NOT MERGEEric Fischer2012-06-043-25/+13
|\| | | |
| * | | | Import translations. DO NOT MERGEEric Fischer2012-06-043-25/+13
| |/ / /
* | | | am 24bd050e: Import translations. DO NOT MERGEEric Fischer2012-06-0136-258/+129
|\| | |
| * | | Import translations. DO NOT MERGEEric Fischer2012-06-0136-258/+129
* | | | am f4392711: Add watchdog to applyRouting().Martijn Coenen2012-05-311-46/+53
|\| | |
| * | | Add watchdog to applyRouting().Martijn Coenen2012-05-311-46/+53
* | | | am 5c1c4487: Import translations. DO NOT MERGEEric Fischer2012-05-3115-93/+47
|\| | |
| * | | Import translations. DO NOT MERGEEric Fischer2012-05-3115-93/+47
| |/ /
* | | am 932c012a: Import translations. DO NOT MERGEEric Fischer2012-05-3017-184/+92
|\| |
| * | Import translations. DO NOT MERGEEric Fischer2012-05-3017-184/+92
* | | Reconcile with jb-releaseThe Android Open Source Project2012-05-300-0/+0
|\ \ \ | | |/ | |/|
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-300-0/+0
| |\ \ | | |/ | |/|
* | | am 2b08c897: Import translations. DO NOT MERGEEric Fischer2012-05-2948-97/+145
|\| |