aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Allow writing exceptions to the ADT log during rendering"Tor Norbye2013-11-261-4/+27
|\
| * Allow writing exceptions to the ADT log during renderingTor Norbye2013-11-251-4/+27
| | | | | | | | Change-Id: Ic4d1f368baf74c110817188731c30849ec43dce3
* | Merge commit '98d18c71cee74e23f2aac3b1c3df5ad81f3a624b' into HEADThe Android Open Source Project2013-11-220-0/+0
|\ \
| * \ am a14e8547: Merge "Switch ADT to 22.3.0 (fix build)"Raphael Moll2013-10-1428-39/+46
| |\ \ | | | | | | | | | | | | | | | | * commit 'a14e8547d20931628519d115952675c52832986d': Switch ADT to 22.3.0 (fix build)
| * \ \ am f62da4db: Merge "Switch ADT to version 22.3"Raphael Moll2013-10-1428-54/+79
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'f62da4dbe0badb8acd6ca9f87294d11342c4f351': Switch ADT to version 22.3
| * \ \ \ am 1343e0d0: Merge "Switch version to Tools 22.3"Raphael Moll2013-10-141-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '1343e0d08b4b58d30f90c10c9b93bb61ee38d6e1': Switch version to Tools 22.3
| * \ \ \ \ am 752bda63: Merge "Increase perm size in default ADT Bundle"Siva Velusamy2013-10-071-1/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '752bda6311b0cfe24df66e679efe988c9619c9b3': Increase perm size in default ADT Bundle
| * \ \ \ \ \ am acbf16e0: Merge "Use the new ResourceUrl API in sdk-common"Tor Norbye2013-09-237-63/+68
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'acbf16e065f27550c5baffe7e4fcd20ff974d435': Use the new ResourceUrl API in sdk-common
| * \ \ \ \ \ \ am 9aeefbc7: Merge "Update changes.txt"Raphael Moll2013-09-191-0/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9aeefbc7837c8b66d9d97015ebc34c66312c6d6c': Update changes.txt
| * \ \ \ \ \ \ \ am 6e3ada8e: Merge "ADT requires Tools 22.2.1"Raphael Moll2013-09-181-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e3ada8e28325df20dd064da92e885b1750c06cd': ADT requires Tools 22.2.1
| * \ \ \ \ \ \ \ \ am 68b27100: Merge "Switch ADT to version 22.2.1"Raphael Moll2013-09-1828-40/+45
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '68b271008acd67928268daa564d602f7209e1c7e': Switch ADT to version 22.2.1
| * \ \ \ \ \ \ \ \ \ am 6d42175b: Merge "Switch to Tools 22.2.1"Raphael Moll2013-09-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d42175ba9bf9fd2dbe52f9a7289e82a039fedac': Switch to Tools 22.2.1
| * \ \ \ \ \ \ \ \ \ \ am 6e97b999: Merge "Rename lombok.jar in tools/lib to match what lint.jar ↵Tor Norbye2013-09-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expects" * commit '6e97b99977a11870eb4e635ae77d0e3226857b46': Rename lombok.jar in tools/lib to match what lint.jar expects
| * \ \ \ \ \ \ \ \ \ \ \ am c30bc752: Merge "Update min-platform-tools from 16 to 18."Raphael Moll2013-09-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c30bc752c9c79ab695cf3aa06ac2c37397f46a82': Update min-platform-tools from 16 to 18.
| * \ \ \ \ \ \ \ \ \ \ \ \ am 2c6fcd8a: Merge "Update path to studio build script"Siva Velusamy2013-09-131-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2c6fcd8af4606c581aa667b85403572d82505eb3': Update path to studio build script
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 7153cf37: Merge "build_server.sh: fix QUALIFIER name."Raphaël Moll2013-09-121-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7153cf37a740188706549484df6a440026085778': build_server.sh: fix QUALIFIER name.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 372568af: Merge "Track API change in tools/base"Tor Norbye2013-09-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '372568afc78c722ce6324f110e244cc26528fd34': Track API change in tools/base
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3012ebca: Merge "Reverting incorrect change"Josiah Gaskin2013-09-091-5/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3012ebca3e950bc8d2ec08e8d43c484b293c1d13': Reverting incorrect change
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f192e65a: Merge "ADT ignores new template dependencies"Josiah Gaskin2013-09-092-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f192e65ae6270fda3382009c0053db756077ffcb': ADT ignores new template dependencies
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 59cd3677: Merge "Correctly parse ldrtl qualifier."Deepanshu Gupta2013-09-051-0/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '59cd3677cd08f949360e732bb8c13e19ed87dc56': Correctly parse ldrtl qualifier.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3b7f07a7: Merge "Fix layout preview for RTL locales"Deepanshu Gupta2013-09-053-1/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b7f07a791288339608459e918ddddf9bce2c539': Fix layout preview for RTL locales
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ba84fc0a: Merge "Update tools/ADT revision."Xavier Ducrohet2013-09-0328-46/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ba84fc0ab91e13c2343d2ebeee478c0edaf02e53': Update tools/ADT revision.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c9162374: Merge "Update traceview for ddmlib API change"Siva Velusamy2013-08-301-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c9162374e341a3cfcf8c97e5bca1b36c3209654b': Update traceview for ddmlib API change
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cd90cc17: Merge "Remove bouncycastle dependency."Xavier Ducrohet2013-08-292-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd90cc177ddfbf0cb098ca4f7340665f104580b8': Remove bouncycastle dependency.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c681a244: Merge "RS Support mode in ADT."Xavier Ducrohet2013-08-2820-841/+828
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c681a2440006afe76e9da316d811e6eda568c121': RS Support mode in ADT.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 86de8a91: Don\'t recursively make when calling create_all_symlinks.sh ↵Ying Wang2013-08-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from a makefile. * commit '86de8a911717ce2581b2b8eafd4ad3fd86577e08': Don't recursively make when calling create_all_symlinks.sh from a makefile.
| | * | | | | | | | | | | | | | | | | | | | | | | | Don't recursively make when calling create_all_symlinks.sh from a makefile.Ying Wang2013-08-263-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The target files should be built as dependencies in the rules that call create_all_symlinks.sh. We already did this in sdk/adtproductbuild/Android.mk and sdk/monitor/Android.mk. Bug: 10347826 Change-Id: I465d227baa7c22ad806652ca7eb20262a4bccf6f
| * | | | | | | | | | | | | | | | | | | | | | | | | am a2af1185: Merge "Don\'t recursively make when calling ↵Ying Wang2013-08-233-20/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | create_all_symlinks.sh from a makefile." * commit 'a2af11851c77884bc9b35f48f6b08a4773f02b64': Don't recursively make when calling create_all_symlinks.sh from a makefile.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4ce884fc: Merge "Fix issue with gradle export."Xavier Ducrohet2013-08-211-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4ce884fce3233d90e600d8ad8b598e788dd17e48': Fix issue with gradle export.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5c9cde6d: Merge "Support for installing SDK in C:\Program Files"Scott Barta2013-08-204-18/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c9cde6dfb1e114cc13f3258b8ee04edb53f0d7b': Support for installing SDK in C:\Program Files
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 45c24e28: Merge changes Ibc381479,I21a2430cXavier Ducrohet2013-08-143-30/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '45c24e282112b7632ffa690f220cf2e4e0ebbe47': ColorBuffer: Remove the y-invert Intel GPU bug workaround EglMacApi: Use the right pbuffer texture target and format parameters
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 002df272: Merge "Renderscript support mode for ant."Xavier Ducrohet2013-08-131-10/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '002df2729fc7b67edbc057a1207f1313d86d1978': Renderscript support mode for ant.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 092e338a: Merge "Check the return value of eglChooseConfig"Xavier Ducrohet2013-08-131-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '092e338a52df9eeb37675ed011d878f59a88808e': Check the return value of eglChooseConfig
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 22abb45f: Merge "adt launch: Fix spelling mistake"Siva Velusamy2013-08-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '22abb45f82e6a53a74562a149848fdbeb2660f09': adt launch: Fix spelling mistake
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 99196f80: Merge "Some changes added to compile and run with Java 6 and ↵Xavier Ducrohet2013-08-123-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java 7." * commit '99196f80d7a8ea1b4f7a710746c43121b81baada': Some changes added to compile and run with Java 6 and Java 7.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 6da9a761: Merge "Update template location for SDK build"Josiah Gaskin2013-07-31273-6436/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6da9a761cd06c67a9c30534b4da2b8447aced5d0': Update template location for SDK build
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am be3b71eb: Merge "Change references from sdktestutils -> testutils"Siva Velusamy2013-07-293-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'be3b71eb1f30ebaf063d0df63e1f082844df24a3': Change references from sdktestutils -> testutils
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f3993f84: Merge "Rename sdktestutils -> testutils"Siva Velusamy2013-07-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f3993f84ff41f40f1aebdda34c7a2617420aa15e': Rename sdktestutils -> testutils
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 88d02470: Merge "Change import path to sparse array"Siva Velusamy2013-07-294-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '88d02470b5afd2e0e5083cf13cff348d229f0ce5': Change import path to sparse array
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a90745a2: Merge "Add clarifying comment."Siva Velusamy2013-07-251-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a90745a21a51f6e5c6a1d66e01cd2397f6ee8a48': Add clarifying comment.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5a0e0edd: Merge "Fix gldebugger formatter test"Siva Velusamy2013-07-251-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a0e0eddb2fb3857ce6bcdbca30c9c0c4e5c12fa': Fix gldebugger formatter test
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5f3c99c7: Merge "Add support for additional ES3 state, primarily for ↵Siva Velusamy2013-07-256-20/+479
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textures" * commit '5f3c99c7458203faf813f579164ab489ed176dcf': Add support for additional ES3 state, primarily for textures
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5f550b74: Merge "Support dynamically linked llvm-rs-cc"Xavier Ducrohet2013-07-252-5/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5f550b74dd192e6f2dd2739b542bd54711e31a6c': Support dynamically linked llvm-rs-cc
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am eb2e2256: Merge "Use systrace html prefix and suffix from platform tools"Siva Velusamy2013-07-253-46/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eb2e22567025be7eb1b5cde0eef6c5c0bc947608': Use systrace html prefix and suffix from platform tools
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 46e78a4c: Merge "Fix renderscript issue on windows."Xavier Ducrohet2013-07-253-13/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '46e78a4c146a82afa531b33f8eaf26f28cf53484': Fix renderscript issue on windows.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 50ab1922: am 3b49d504: Merge "Fix gradle export on windows."Xavier Ducrohet2013-07-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '50ab1922a3e5cb1f275dc7f49d7fe8bd8e090728': Fix gradle export on windows.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ef9cc936: am 77ba389d: Merge "Remove systrace from tools.atree"Siva Velusamy2013-07-221-8/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ef9cc936344a7703d255319cde71dc629434dc13': Remove systrace from tools.atree
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8a326dd7: am 9d8f40dd: Merge changes Ie793b684,I083290cdRaphael Moll2013-07-162-50/+141
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a326dd7d4e6d049659c6f84cc859bd966e42721': Change create_symlinks to use gradle-based libraries. ADT: fix missing lib dependency in ADT base.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b8f35113: am b251da9c: Merge "Force containers to be exported if maven is ↵Xavier Ducrohet2013-07-121-12/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not used." * commit 'b8f351131d86077e07bd4fe2f76561ccfd8ed46f': Force containers to be exported if maven is not used.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a5e16a22: am 49fa77c2: Merge "Fix error detection on ExportStatus."Xavier Ducrohet2013-07-121-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5e16a222cedde19069f49b952aef3fb3478c363': Fix error detection on ExportStatus.