Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Only include RS prebuilts in unbundled branches, not PDK. | Tim Murray | 2013-02-04 | 1 | -44/+55 | |
* | Fix PDK build break. | Tim Murray | 2013-02-04 | 1 | -5/+5 | |
* | Attempt #2: Unbundled RS compatibility library support | Tim Murray | 2013-02-01 | 11 | -0/+94 | |
* | Revert "Unbundled RS compatibility library support" | Stephen Hines | 2013-01-23 | 11 | -94/+0 | |
* | Unbundled RS compatibility library support | Stephen Hines | 2013-01-22 | 11 | -0/+94 | |
* | Update current SDK as of build #556245 in master. | Ying Wang | 2013-01-10 | 1 | -0/+0 | |
* | Update renderscript to build AAQ07 #553727 in master-release. | Ying Wang | 2013-01-07 | 41 | -326/+4471 | |
* | Drop prebuilt current SDK as of build #547874 in master. | Ying Wang | 2012-12-14 | 1 | -0/+0 | |
* | Move numeric api files from frameworks/base to prebuilts/sdk | Ying Wang | 2012-12-04 | 17 | -0/+5230707 | |
* | am eb754fc0: (-s ours) am ca49f477: (-s ours) Merge jb-mr1-dev into aosp/mast... | The Android Open Source Project | 2012-11-27 | 0 | -0/+0 | |
|\ | ||||||
| * | am ca49f477: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge | The Android Open Source Project | 2012-11-27 | 0 | -0/+0 | |
| |\ | ||||||
| | * | Merge jb-mr1-dev into aosp/master - do not merge | The Android Open Source Project | 2012-11-27 | 3 | -0/+51 | |
| | |\ | ||||||
* | | \ | am 350b4e9c: (-s ours) Reconcile with jb-mr1.1-release - do not merge | The Android Open Source Project | 2012-11-14 | 0 | -0/+0 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Reconcile with jb-mr1.1-release - do not merge | The Android Open Source Project | 2012-11-14 | 0 | -0/+0 | |
| |\ \ \ | ||||||
| | * \ \ | merge in jb-mr1.1-release history after reset to jb-mr1.1-dev | The Android Automerger | 2012-11-14 | 0 | -0/+0 | |
| | |\ \ \ | ||||||
* | | \ \ \ | am c15624c7: am 1450c47b: am 5243f864: am 07a523b2: Drop official SDK 17 | Ying Wang | 2012-11-13 | 3 | -0/+51 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | am 1450c47b: am 5243f864: am 07a523b2: Drop official SDK 17 | Ying Wang | 2012-11-13 | 3 | -0/+51 | |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
| | * | | | | am 5243f864: am 07a523b2: Drop official SDK 17 | Ying Wang | 2012-11-13 | 3 | -0/+51 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | am 07a523b2: Drop official SDK 17 | Ying Wang | 2012-11-13 | 3 | -0/+51 | |
| | | |\ \ \ | | | | | |/ | | | | |/| | ||||||
| | | | * | | Drop official SDK 17 | Ying Wang | 2012-11-13 | 3 | -0/+51 | |
* | | | | | | am 7b8eccfd: (-s ours) am d3ef8914: am a11e2d20: Reconcile with jb-mr1-releas... | The Android Open Source Project | 2012-11-08 | 0 | -0/+0 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | am d3ef8914: am a11e2d20: Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-08 | 0 | -0/+0 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | am a11e2d20: Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 | |
| | | |\ \ \ | ||||||
| | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-11-06 | 0 | -0/+0 | |
| | | | |\ \ \ | | | | | |/ / | | | | |/| | | ||||||
* | | | | | | | am bc744470: (-s ours) Reconcile with jb-mr1.1-release - do not merge | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Reconcile with jb-mr1.1-release - do not merge | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 | |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | ||||||
| | * | | | | | merge in jb-mr1.1-release history after reset to jb-mr1.1-dev | The Android Automerger | 2012-11-06 | 0 | -0/+0 | |
| | |\ \ \ \ \ | ||||||
* | | \ \ \ \ \ | am 08ea3b10: (-s ours) am 5535a9e9: am 8a1238b6: Reconcile with jb-mr1-factor... | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am 5535a9e9: am 8a1238b6: Reconcile with jb-mr1-factory-release jb-mr1-releas... | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | * | | | | | | am 8a1238b6: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | ||||||
| | | | | | | | | ||||||
| | | | \ \ \ \ | ||||||
| | | *-. \ \ \ \ | Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-06 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | | | ||||||
* | | | | | | | | | am 26f928ce: (-s ours) am 062f3c13: am 94d1dc58: am bfb25615: (-s ours) [DO N... | Ying Wang | 2012-11-06 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | am 062f3c13: am 94d1dc58: am bfb25615: (-s ours) [DO NOT MERGE]Drop current S... | Ying Wang | 2012-11-06 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | am 94d1dc58: am bfb25615: (-s ours) [DO NOT MERGE]Drop current SDK as of JOP3... | Ying Wang | 2012-11-06 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | ||||||
| | | * | | | | | | am bfb25615: (-s ours) [DO NOT MERGE]Drop current SDK as of JOP36 #524024 fro... | Ying Wang | 2012-11-06 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | / | | | | | |_|_|/ | | | | |/| | | | ||||||
| | | | * | | | | [DO NOT MERGE]Drop current SDK as of JOP36 #524024 from jb-mr1-release | Ying Wang | 2012-11-06 | 1 | -0/+0 | |
| | | |/ / / / | ||||||
* | | | | | | | am 4fdc57e3: (-s ours) Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-05 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-05 | 0 | -0/+0 | |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | ||||||
| | * | | | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-11-03 | 0 | -0/+0 | |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | / | | | | |_|/ | | | |/| | | ||||||
* | | | | | | am d270339f: (-s ours) am 11416fc8: am 118e3fd9: (-s ours) [DO NOT MERGE]Drop... | Ying Wang | 2012-11-02 | 0 | -0/+0 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | am 11416fc8: am 118e3fd9: (-s ours) [DO NOT MERGE]Drop current SDK as of JOP3... | Ying Wang | 2012-11-02 | 0 | -0/+0 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | * | | | | am 118e3fd9: (-s ours) [DO NOT MERGE]Drop current SDK as of JOP32C #522705 fr... | Ying Wang | 2012-11-02 | 0 | -0/+0 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | [DO NOT MERGE]Drop current SDK as of JOP32C #522705 from jb-mr1-release | Ying Wang | 2012-11-02 | 1 | -0/+0 | |
* | | | | | | am 81d97c81: (-s ours) Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-02 | 0 | -0/+0 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-11-02 | 0 | -0/+0 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | * | | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-11-01 | 0 | -0/+0 | |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | ||||||
* | | | | | | am 08709468: (-s ours) am e18dddfc: am dae9c8c3: (-s ours) [DO NOT MERGE] Dro... | Ying Wang | 2012-11-01 | 0 | -0/+0 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | am e18dddfc: am dae9c8c3: (-s ours) [DO NOT MERGE] Drop current SDK as of bui... | Ying Wang | 2012-11-01 | 0 | -0/+0 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | * | | | | am dae9c8c3: (-s ours) [DO NOT MERGE] Drop current SDK as of build JOP31 #520... | Ying Wang | 2012-11-01 | 0 | -0/+0 | |
| | |\ \ \ \ | | | |/ / / |