summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | [DO NOT MERGE] Drop current SDK as of build JOP31 #520834 from jb-mr1-release.Ying Wang2012-11-011-0/+0
* | | | | | am b2cb14e0: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-310-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-310-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-230-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/|
* | | | | Drop a new android.jar to fix build. Do not merge.Lei Zhang2012-10-291-0/+0
* | | | | Check in new current android.jar to fix build. Do not mergeRoboErik2012-10-251-0/+0
* | | | | Drop prebuilt aidl as of build 515235 in master.Ying Wang2012-10-242-0/+0
* | | | | am e70625a1: am cea665f0: am 30789c2f: Update prebuilt aapt to as of JOP23B #...Ying Wang2012-10-232-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am cea665f0: am 30789c2f: Update prebuilt aapt to as of JOP23B #513372 in jb-...Ying Wang2012-10-232-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | am 30789c2f: Update prebuilt aapt to as of JOP23B #513372 in jb-mr1-releaseYing Wang2012-10-232-0/+0
| | |\ \ \ | | | |/ /
| | | * | Update prebuilt aapt to as of JOP23B #513372 in jb-mr1-releaseYing Wang2012-10-232-0/+0
* | | | | am 327999d9: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-090-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-090-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-070-0/+0
| | |\ \ \ | | | |_|/ | | |/| |
* | | | | am 109722fa: am 6cd87ee3: am d98af149: (-s ours) Drop current sdk as of build...Ying Wang2012-10-070-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 6cd87ee3: am d98af149: (-s ours) Drop current sdk as of build JOP07C #4933...Ying Wang2012-10-070-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | am d98af149: (-s ours) Drop current sdk as of build JOP07C #493301 from jb-mr...Ying Wang2012-10-070-0/+0
| | |\ \ \ | | | |/ /
| | | * | Drop current sdk as of build JOP07C #493301 from jb-mr1-release.Ying Wang2012-10-071-0/+0
* | | | | Drop master current SDK as of build #492977Ying Wang2012-10-071-0/+0
* | | | | am 80db3afc: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-040-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-040-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-040-0/+0
| | |\ \ \ | | | |_|/ | | |/| |
* | | | | Merge "Drop prebuilt current SDK as of build #487254 in master."Ying Wang2012-10-031-0/+0
|\ \ \ \ \
| * | | | | Drop prebuilt current SDK as of build #487254 in master.Ying Wang2012-10-031-0/+0
* | | | | | am c1e3949c: am 2223fae1: am 16331d95: am 6ab59c98: am 7337fade: Add prebuilt...Ying Wang2012-10-032-2/+11
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | am 2223fae1: am 16331d95: am 6ab59c98: am 7337fade: Add prebuilts/sdk/16/uiau...Ying Wang2012-10-032-2/+11
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | am 16331d95: am 6ab59c98: am 7337fade: Add prebuilts/sdk/16/uiautomator.jar a...Ying Wang2012-10-032-2/+11
| | |\ \ \ | | | |/ /
| | | * | am 6ab59c98: am 7337fade: Add prebuilts/sdk/16/uiautomator.jar as of JZO54K ...Ying Wang2012-10-032-2/+11
| | | |\ \
| | | | * \ am 7337fade: Add prebuilts/sdk/16/uiautomator.jar as of JZO54K #485486Ying Wang2012-10-032-2/+11
| | | | |\ \
| | | | | * | Add prebuilts/sdk/16/uiautomator.jar as of JZO54K #485486Ying Wang2012-10-022-2/+11
* | | | | | | am d170e491: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-020-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-020-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-300-0/+0
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
* | | | | | | am 8ffcbe9d: am 34ab1d80: am ef6a43c2: (-s ours) Drop current SDK as of build...Ying Wang2012-10-010-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 34ab1d80: am ef6a43c2: (-s ours) Drop current SDK as of build #482637 in j...Ying Wang2012-10-010-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am ef6a43c2: (-s ours) Drop current SDK as of build #482637 in jb-mr1-dev.Ying Wang2012-09-290-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Drop current SDK as of build #482637 in jb-mr1-dev.Ying Wang2012-09-291-0/+0
* | | | | | | am ce4edcd3: Merge from jb-mr1-aah-devJean-Baptiste Queru2012-09-280-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge from jb-mr1-aah-devJean-Baptiste Queru2012-09-280-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am af3121de: (-s ours) [DO NOT MERGE] Drop current SDK as of build# 474859 in...Ying Wang2012-09-240-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | am 3a60b223: (-s ours) [DO NOT MERGE] Drop the current SDK as of JOO82C #4723...Ying Wang2012-09-210-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ am 7fff9dd1: Use prebuilts for PDK build.Ying Wang2012-09-201-5/+1
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am fd32b77f: Check in prebuilt signapk.jar as of build #470905Ying Wang2012-09-202-1/+14
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am 08d16f30: (-s ours) [DO NOT MERGE] Drop the current SDK as of JOO76 #4663...Ying Wang2012-09-140-0/+0
| | |\ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ am 35abf7ab: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-250-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
* | | | | | | | | | | am 803d933e: (-s ours) am af3121de: [DO NOT MERGE] Drop current SDK as of bui...Ying Wang2012-09-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am af3121de: [DO NOT MERGE] Drop current SDK as of build# 474859 in jb-mr1-devYing Wang2012-09-241-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | [DO NOT MERGE] Drop current SDK as of build# 474859 in jb-mr1-devYing Wang2012-09-241-0/+0
| | | |_|_|_|_|/ / / | | |/| | | | | | |