summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-28Update SDK prebuilts.Xavier Ducrohet
Origin: tools/base: @ f459769d63b015281d79d67ce612aa900ecf6306 tools/swt: @ 673aefc4f92238836c4381d92dac2f73f31c120a Change-Id: Id21b8d455665d27b0c32377c7990091d84e38fcc
2013-08-29Merge "Update script to put a newline after the first msg line."Xavier Ducrohet
2013-08-28Update script to put a newline after the first msg line.Xavier Ducrohet
Change-Id: I3116cec26d583ef1c8da93e08fd1225e634426b0
2013-08-20am 13799c1b: Merge "Update SDK prebuilts. Origin:"Scott Barta
* commit '13799c1b3a46930100980493f4f88553de1c9e3f': Update SDK prebuilts. Origin:
2013-08-20Merge "Update SDK prebuilts. Origin:"Scott Barta
2013-08-20Update SDK prebuilts.Scott Barta
Origin: tools/base: @ 4262954a840e8ded11067279bcc50b5a9de1a65e tools/swt: @ 673aefc4f92238836c4381d92dac2f73f31c120a Change-Id: Iba6ba97a2eb1f9d0cd0309bd0469d3b68bcfe05c
2013-07-30am feec3461: Merge "Update sdkuilib prebuilt after changing SparseArray ↵android-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-cts-releasekitkat-cts-devSiva Velusamy
import path" * commit 'feec34619d680a7836f1b07d7fefc5ab8f6e07af': Update sdkuilib prebuilt after changing SparseArray import path
2013-07-30Merge "Update sdkuilib prebuilt after changing SparseArray import path"Siva Velusamy
2013-07-30Update sdkuilib prebuilt after changing SparseArray import pathSiva Velusamy
Origin: tools/base: @ 6bafeffea4a051ac78572bb1d403ee5682dc2f73 tools/swt: @ fe30ee3a716015332e696d34d19bc27146a92cb6 Change-Id: I53b6c9607099ebc8789839919a969bce3b0be615
2013-07-29am f8b9f85b: Merge "Update lint launcher prebuilts to add awt.headless option"Siva Velusamy
* commit 'f8b9f85b9687a34487d7a46f26adbfc51edb9722': Update lint launcher prebuilts to add awt.headless option
2013-07-29am 3971291e: Merge "Update common.jar and sdklib.jar after moving SparseArray"Siva Velusamy
* commit '3971291e1fd4364d28f44592da21661a192adb91': Update common.jar and sdklib.jar after moving SparseArray
2013-07-29Merge "Update lint launcher prebuilts to add awt.headless option"Siva Velusamy
2013-07-29Update lint launcher prebuilts to add awt.headless optionSiva Velusamy
Change-Id: Ifb18d620052a4c9f573001ff9c28ee8fad205dd2
2013-07-29Merge "Update common.jar and sdklib.jar after moving SparseArray"Siva Velusamy
2013-07-29Update common.jar and sdklib.jar after moving SparseArraySiva Velusamy
SparseArray was moved from sdklib to common in 90642a18aa66491c267ec5d77db3f8de4f862443 Origin: tools/base: @ 01ddae175891efe15dc3e35bbb2d64486eb1b1ec tools/swt: @ 52b357550ed47389c87b786baa43a54e1219bece Change-Id: Ie1679cdd79bd2c3bbddbec64d7012d7fdccce847
2013-06-14am f7c044ba: am febc58ce: Merge "Update SDK prebuilts."Tor Norbye
* commit 'f7c044bac4a638edcfa76f990f257b6e6275417e': Update SDK prebuilts.
2013-06-14am febc58ce: Merge "Update SDK prebuilts."Tor Norbye
* commit 'febc58ce376ae6f46c0425c851712b3893a03306': Update SDK prebuilts.
2013-06-14Merge "Update SDK prebuilts."jb-mr1.1-dev-plus-aospTor Norbye
2013-06-13Update SDK prebuilts.Tor Norbye
Origin: tools/base: @ 68a85214fef4523217c9b77f5cdbc682482a97a5 tools/swt: @ f1bbfdc23a11ae3b2976ecb7d455942c738696c0 Change-Id: I238cd9f0a35134d8dbd892ae160fefe3cb279620
2013-06-13am 5b23eb60: am 59aee263: Merge "Update SDK prebuilts: sdklib, ant-tasks."Raphael Moll
* commit '5b23eb60c317f001133f083520425a4ce0c9745f': Update SDK prebuilts: sdklib, ant-tasks.
2013-06-13am 59aee263: Merge "Update SDK prebuilts: sdklib, ant-tasks."Raphael Moll
* commit '59aee2630f82832c2c1db235fd11b4a6dbcb5d51': Update SDK prebuilts: sdklib, ant-tasks.
2013-06-13Merge "Update SDK prebuilts: sdklib, ant-tasks."Raphael Moll
2013-06-13Update SDK prebuilts: sdklib, ant-tasks.Raphael Moll
Changed: new AndroidTargetHash. Origin: tools/base: @ a1e85ca15298cdf451a3a0756aeb3151823f4539 Change-Id: I43d6ad70964994e164d3b69699904c6c51ed2723
2013-05-30am 3b92a56f: am 8b8c456e: Merge "Update ddmlib and ddmuilib prebuilts."Siva Velusamy
* commit '3b92a56f8dd05df91276311260d470c71160e2b2': Update ddmlib and ddmuilib prebuilts.
2013-05-30am 8b8c456e: Merge "Update ddmlib and ddmuilib prebuilts."Siva Velusamy
* commit '8b8c456ea8f56552bf00b90390d3eb99b796b4a8': Update ddmlib and ddmuilib prebuilts.
2013-05-31Merge "Update ddmlib and ddmuilib prebuilts."Siva Velusamy
2013-05-30Update ddmlib and ddmuilib prebuilts.Siva Velusamy
Includes fixes for a bunch of issues: - Fixed allocation counts Native Heap panel diff view - Fixed crashes in SysInfoPanel Origin: tools/base: @ 1be8904f2432b70e55e42f5592edc7bc6d43c7e7 tools/swt: @ df52dfeccf8e8bdf9d7b6980e0a049452ca9ba67 Change-Id: I21481c0e534ddd81388154408bef15290546e784
2013-05-22am a8c73896: am 934e7e9b: Merge "Replace jython with jython-standalone."Xavier Ducrohet
* commit 'a8c73896ff85e327cab2042da40b87d94cf4c80c': Replace jython with jython-standalone.
2013-05-22am 934e7e9b: Merge "Replace jython with jython-standalone."Xavier Ducrohet
* commit '934e7e9b9a0f8c00acc3926985dab9277c3965da': Replace jython with jython-standalone.
2013-05-22Merge "Replace jython with jython-standalone."Xavier Ducrohet
2013-05-21Replace jython with jython-standalone.Xavier Ducrohet
Update monkeyrunner since its internal dependency changed. Change-Id: I9564e3e24d954ec8b1c6201a141a54c6001c9429
2013-05-08am 97a0d98f: am ec1bec62: Reconcile with tools_r22Conley Owens
* commit '97a0d98f9e019b03154df127d819c4c2a45a81dd': Update SDK prebuilts: ant-tasks after sdklib API change. Update SDK prebuilts: common. Update SDK prebuilts: sdkmanager command-line license. Update JAR option to specify which libs to keep. Update SDK prebuilts: sdklib, sdkuilib, sdkmanager. Update prebuilts script can now detect if JARs have actually changed. Update prebuilts. Update SDK prebuilts (sdkuilib, lint-check, sdk-common). Update script to update all prebuilts. Update SDKuilib prebuilt: missing icon for build-tool package.
2013-05-08am 9c1c837d: am 5a699fd5: Merge "Update SDK prebuilts."Xavier Ducrohet
* commit '9c1c837dcb55e8a9c4af756074425d14775feccc': Update SDK prebuilts.
2013-05-08am ec1bec62: Reconcile with tools_r22Conley Owens
* commit 'ec1bec62a296146e6b7742ef8bda346b1923ea7c': Update SDK prebuilts: ant-tasks after sdklib API change. Update SDK prebuilts: common. Update SDK prebuilts: sdkmanager command-line license. Update JAR option to specify which libs to keep. Update SDK prebuilts: sdklib, sdkuilib, sdkmanager. Update prebuilts script can now detect if JARs have actually changed. Update prebuilts. Update SDK prebuilts (sdkuilib, lint-check, sdk-common). Update script to update all prebuilts. Update SDKuilib prebuilt: missing icon for build-tool package.
2013-05-08Reconcile with tools_r22Conley Owens
2013-05-08am 5a699fd5: Merge "Update SDK prebuilts."Xavier Ducrohet
* commit '5a699fd53509fc434c40799c3aca488fd6d347cc': Update SDK prebuilts.
2013-05-08Merge "Update SDK prebuilts."Xavier Ducrohet
2013-05-08Update SDK prebuilts.Xavier Ducrohet
Origin: tools/base: @ 19a21a271acc17107e61624f1a6b732fbde3a006 tools/swt: @ 6cfb288822127acc19304789fb6b6e27bcec04fe Change-Id: Ia165fd2fb31a0de67c8a37c4c9ec8e8ddc4df326
2013-05-03am 70934a9a: (-s ours) am 42f8ef35: Sync jb-mr2 prebuilts to be the same as ↵Siva Velusamy
AOSP and master DO NOT MERGE * commit '70934a9a55f31409ed930130154843a1a959c6a1': Sync jb-mr2 prebuilts to be the same as AOSP and master DO NOT MERGE
2013-05-03am 42f8ef35: Sync jb-mr2 prebuilts to be the same as AOSP and master DO NOT ↵Siva Velusamy
MERGE * commit '42f8ef3570f43414858a974ddd593ac13ab02163': Sync jb-mr2 prebuilts to be the same as AOSP and master DO NOT MERGE
2013-05-03Sync jb-mr2 prebuilts to be the same as AOSP and master DO NOT MERGEandroid-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devSiva Velusamy
Change-Id: I046b711e65c18278f40ac3bdcf61ba4a5a6e6a57
2013-04-23Merge "Update SDK prebuilts: ant-tasks after sdklib API change." into tools_r22Raphael Moll
2013-04-23Update SDK prebuilts: ant-tasks after sdklib API change.Raphael Moll
Origin: tools/base: @ 24ffabf0f6ceb88e7d8b3bda12e95a4a3f5580c7 ant-tasks.jar needed to be refreshed after the change to the sdklib.getLatestBuildTool() API change. Change-Id: I3ce468aefc21d8d2ffe9f5b153a44430e8f8679a
2013-04-18resolved conflicts for merge of 479992f3 to jb-mr2-dev-plus-aospSiva Velusamy
Change-Id: Ie93f7fd5fdb9b0d31026695a08962c33aa979de9
2013-04-18Merge "Update SDK prebuilts. Yet again."Siva Velusamy
2013-04-18Update SDK prebuilts. Yet again.Siva Velusamy
This is simply to make sure that the internal trees are in sync with AOSP. Origin: tools/base: @ 32a6b95bf32fd4b198c3a36b8204a019cc075ad7 tools/swt: @ a2312c9e59568737bab4d1d0b5e03a57dc0dac11 Change-Id: I490a7f5aec754a4e88b1fdd5d74d4fa318f6e7d5
2013-04-17resolved conflicts for merge of 950f844b to jb-mr2-dev-plus-aospXavier Ducrohet
Change-Id: Ie29f7428c461b7b264b49cf7ad5fc9e2b71376fe
2013-04-18Merge "Update SDK prebuilts."Xavier Ducrohet
2013-04-17Update SDK prebuilts.Xavier Ducrohet
Origin: tools/base: @ 32a6b95bf32fd4b198c3a36b8204a019cc075ad7 tools/swt: @ a2312c9e59568737bab4d1d0b5e03a57dc0dac11 Change-Id: I9d293955a79c1f92ede2d177bc4bad665160f8cc
2013-04-17am bee40137: Update prebuilts from master. DO NOT MERGE.Siva Velusamy
* commit 'bee401371b142f37ff206fd54514fbfb4c9fe82c': Update prebuilts from master. DO NOT MERGE.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 08:13:09 +0000