summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Only include RS prebuilts in unbundled branches, not PDK.Tim Murray2013-02-041-44/+55
* Fix PDK build break.Tim Murray2013-02-041-5/+5
* Attempt #2: Unbundled RS compatibility library supportTim Murray2013-02-0111-0/+94
* Revert "Unbundled RS compatibility library support"Stephen Hines2013-01-2311-94/+0
* Unbundled RS compatibility library supportStephen Hines2013-01-2211-0/+94
* Update current SDK as of build #556245 in master.Ying Wang2013-01-101-0/+0
* Update renderscript to build AAQ07 #553727 in master-release.Ying Wang2013-01-0741-326/+4471
* Drop prebuilt current SDK as of build #547874 in master.Ying Wang2012-12-141-0/+0
* Move numeric api files from frameworks/base to prebuilts/sdkYing Wang2012-12-0417-0/+5230707
* am eb754fc0: (-s ours) am ca49f477: (-s ours) Merge jb-mr1-dev into aosp/mast...The Android Open Source Project2012-11-270-0/+0
|\
| * am ca49f477: (-s ours) Merge jb-mr1-dev into aosp/master - do not mergeThe Android Open Source Project2012-11-270-0/+0
| |\
| | * Merge jb-mr1-dev into aosp/master - do not mergeThe Android Open Source Project2012-11-273-0/+51
| | |\
* | | \ am 350b4e9c: (-s ours) Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-140-0/+0
|\ \ \ \ | |/ / /
| * | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-140-0/+0
| |\ \ \
| | * \ \ merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-140-0/+0
| | |\ \ \
* | | \ \ \ am c15624c7: am 1450c47b: am 5243f864: am 07a523b2: Drop official SDK 17Ying Wang2012-11-133-0/+51
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1450c47b: am 5243f864: am 07a523b2: Drop official SDK 17Ying Wang2012-11-133-0/+51
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | am 5243f864: am 07a523b2: Drop official SDK 17Ying Wang2012-11-133-0/+51
| | |\ \ \ \ | | | |/ / /
| | | * | | am 07a523b2: Drop official SDK 17Ying Wang2012-11-133-0/+51
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Drop official SDK 17Ying Wang2012-11-133-0/+51
* | | | | | am 7b8eccfd: (-s ours) am d3ef8914: am a11e2d20: Reconcile with jb-mr1-releas...The Android Open Source Project2012-11-080-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d3ef8914: am a11e2d20: Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-080-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am a11e2d20: Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-060-0/+0
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
* | | | | | | am bc744470: (-s ours) Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-060-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ am 08ea3b10: (-s ours) am 5535a9e9: am 8a1238b6: Reconcile with jb-mr1-factor...The Android Open Source Project2012-11-060-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 5535a9e9: am 8a1238b6: Reconcile with jb-mr1-factory-release jb-mr1-releas...The Android Open Source Project2012-11-060-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | am 8a1238b6: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | | | | | |
| | | | \ \ \ \
| | | *-. \ \ \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | | |\ \ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | |
* | | | | | | | | am 26f928ce: (-s ours) am 062f3c13: am 94d1dc58: am bfb25615: (-s ours) [DO N...Ying Wang2012-11-060-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 062f3c13: am 94d1dc58: am bfb25615: (-s ours) [DO NOT MERGE]Drop current S...Ying Wang2012-11-060-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 94d1dc58: am bfb25615: (-s ours) [DO NOT MERGE]Drop current SDK as of JOP3...Ying Wang2012-11-060-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am bfb25615: (-s ours) [DO NOT MERGE]Drop current SDK as of JOP36 #524024 fro...Ying Wang2012-11-060-0/+0
| | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | / | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | [DO NOT MERGE]Drop current SDK as of JOP36 #524024 from jb-mr1-releaseYing Wang2012-11-061-0/+0
| | | |/ / / /
* | | | | | | am 4fdc57e3: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-050-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-050-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-030-0/+0
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | / | | | | |_|/ | | | |/| |
* | | | | | am d270339f: (-s ours) am 11416fc8: am 118e3fd9: (-s ours) [DO NOT MERGE]Drop...Ying Wang2012-11-020-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 11416fc8: am 118e3fd9: (-s ours) [DO NOT MERGE]Drop current SDK as of JOP3...Ying Wang2012-11-020-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | am 118e3fd9: (-s ours) [DO NOT MERGE]Drop current SDK as of JOP32C #522705 fr...Ying Wang2012-11-020-0/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | [DO NOT MERGE]Drop current SDK as of JOP32C #522705 from jb-mr1-releaseYing Wang2012-11-021-0/+0
* | | | | | am 81d97c81: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-020-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-020-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-010-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | am 08709468: (-s ours) am e18dddfc: am dae9c8c3: (-s ours) [DO NOT MERGE] Dro...Ying Wang2012-11-010-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am e18dddfc: am dae9c8c3: (-s ours) [DO NOT MERGE] Drop current SDK as of bui...Ying Wang2012-11-010-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | am dae9c8c3: (-s ours) [DO NOT MERGE] Drop current SDK as of build JOP31 #520...Ying Wang2012-11-010-0/+0
| | |\ \ \ \ | | | |/ / /