aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | Merge "Fix Template Inflation in ADT" into idea133Josiah Gaskin2014-06-306-9/+128
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 66c679f * commit '66c679f3506d72e9a5fc2e2310605e82782b483d': Fix Template Inflation in ADT
| | | * | | | | | | | | | | Merge "Fix Template Inflation in ADT" into idea133Josiah Gaskin2014-06-276-9/+128
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Fix Template Inflation in ADTJosiah Gaskin2014-06-276-9/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change updates template handling in ADT to handle new tags including formfactor and category. Change-Id: Ia9bd6bdcfaf40061835381f8d3c6f8d67274d694
* | | | | | | | | | | | | | am 03d20a2b: am 35802380: Merge "Update version to 23.0.1" into idea133 ↵Xavier Ducrohet2014-06-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 2ac5b9c * commit '03d20a2bd4d12381deb17943db95fefd8a257622': Update version to 23.0.1
| * | | | | | | | | | | | | am 35802380: Merge "Update version to 23.0.1" into idea133 automerge: 2ac5b9cXavier Ducrohet2014-06-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '35802380cf57b0a8c4ee89ed42dc8f4d0a755bf2': Update version to 23.0.1
| | * | | | | | | | | | | | Merge "Update version to 23.0.1" into idea133Xavier Ducrohet2014-06-271-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 2ac5b9c * commit '2ac5b9c76d99fc457026cad8a636265f8947f84e': Update version to 23.0.1
| | | * | | | | | | | | | | Merge "Update version to 23.0.1" into idea133Xavier Ducrohet2014-06-271-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Update version to 23.0.1Xavier Ducrohet2014-06-271-1/+1
| | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I08ecb6c485b98147a51bc0f58156659b1822741b
* | | | | | | | | | | | | | am 1c76e953: am 1974a8c2: Merge "Update plugin versions to 23.0.1" into ↵Siva Velusamy2014-06-2752-82/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | idea133 automerge: 13df34d * commit '1c76e953ba1c0dd4ba062cf335b3066b431992f2': Update plugin versions to 23.0.1
| * | | | | | | | | | | | | am 1974a8c2: Merge "Update plugin versions to 23.0.1" into idea133 ↵Siva Velusamy2014-06-2752-82/+82
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 13df34d * commit '1974a8c2628340d2ae2c842ce7e4d9f6a921c2be': Update plugin versions to 23.0.1
| | * | | | | | | | | | | | Merge "Update plugin versions to 23.0.1" into idea133Siva Velusamy2014-06-2752-82/+82
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 13df34d * commit '13df34d6d2e2ba8e70f3e2e92858041ce1ae664d': Update plugin versions to 23.0.1
| | | * | | | | | | | | | | Merge "Update plugin versions to 23.0.1" into idea133Siva Velusamy2014-06-2652-82/+82
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Update plugin versions to 23.0.1Siva Velusamy2014-06-2752-82/+82
| | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icb5be47b688808488811411a5f45a23a49f774d2
* | | | | | | | | | | | | | am 9f15158b: am af28256e: Merge "Fix proguard packaging in the tools." into ↵Xavier Ducrohet2014-06-271-0/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | idea133 automerge: 327b773 * commit '9f15158b729daf26c8a5b5578078dc7e2927ca53': Fix proguard packaging in the tools.
| * | | | | | | | | | | | | am af28256e: Merge "Fix proguard packaging in the tools." into idea133 ↵Xavier Ducrohet2014-06-271-0/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 327b773 * commit 'af28256ec72fa740d08cdea73e25a5ab7e17449a': Fix proguard packaging in the tools.
| | * | | | | | | | | | | | Merge "Fix proguard packaging in the tools." into idea133Xavier Ducrohet2014-06-271-0/+53
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 327b773 * commit '327b7734e8a3a499671f00a810b8b9ebb8a5a610': Fix proguard packaging in the tools.
| | | * | | | | | | | | | | Merge "Fix proguard packaging in the tools." into idea133Xavier Ducrohet2014-06-261-0/+53
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Fix proguard packaging in the tools.Xavier Ducrohet2014-06-271-0/+53
| | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I061734afecaca30582e6659303c17b2154be8f47
* | | | | | | | | | | | | | am f3d94e25: am a5c9a26a: Merge "Build and release annotations.jar" into ↵Siva Velusamy2014-06-272-0/+210
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | idea133 automerge: 82ff48b * commit 'f3d94e255b59c2b2a3aa522609ea4507f1675780': Build and release annotations.jar
| * | | | | | | | | | | | | am a5c9a26a: Merge "Build and release annotations.jar" into idea133 ↵Siva Velusamy2014-06-272-0/+210
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 82ff48b * commit 'a5c9a26a207c74f8cb119f3f845ab7e4115ef829': Build and release annotations.jar
| | * | | | | | | | | | | | Merge "Build and release annotations.jar" into idea133Siva Velusamy2014-06-272-0/+210
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 82ff48b * commit '82ff48bd845a8aee9d51cf31faa8c24b0fae06aa': Build and release annotations.jar
| | | * | | | | | | | | | | Merge "Build and release annotations.jar" into idea133Siva Velusamy2014-06-262-0/+210
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Build and release annotations.jarSiva Velusamy2014-06-272-0/+210
| | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If36461c0f2358273f6d781ed9fbb039d6090b18c
* | | | | | | | | | | | | | am 841291cf: am 37d165a8: Merge "monitor: Update path to hprof-conv" into ↵Siva Velusamy2014-06-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | idea133 automerge: d187c91 * commit '841291cf3dcc848eee8bdd57138da30b3621c198': monitor: Update path to hprof-conv
| * | | | | | | | | | | | | am 37d165a8: Merge "monitor: Update path to hprof-conv" into idea133 ↵Siva Velusamy2014-06-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: d187c91 * commit '37d165a8c46afc4cde9d81f20a1e68336cc20f38': monitor: Update path to hprof-conv
| | * | | | | | | | | | | | Merge "monitor: Update path to hprof-conv" into idea133Siva Velusamy2014-06-271-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: d187c91 * commit 'd187c91b92e0609696225fdae0aa905058596df8': monitor: Update path to hprof-conv
| | | * | | | | | | | | | | Merge "monitor: Update path to hprof-conv" into idea133Siva Velusamy2014-06-261-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | monitor: Update path to hprof-convSiva Velusamy2014-06-271-1/+1
| | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From tools r22.3, hprof-conv is inside platform-tools, not tools. I've filed https://code.google.com/p/android/issues/detail?id=72570 to make a better fix in the future. Change-Id: I21af21f9e2e6383c9d89be5d94c5474f42e32aec
* | | | | | | | | | | | | am 87d16b8b: am edbe9171: Merge "Fix zipalign/hprof-conv issue in ADT." into ↵Xavier Ducrohet2014-06-226-27/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | idea133 automerge: 2206210 * commit '87d16b8b0f9fe230de0b3184066c9c7f8349d2f2': Fix zipalign/hprof-conv issue in ADT.
| * | | | | | | | | | | | am edbe9171: Merge "Fix zipalign/hprof-conv issue in ADT." into idea133 ↵Xavier Ducrohet2014-06-216-27/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 2206210 * commit 'edbe9171d2586fcd4083c5a9d848ab27d2e7c72e': Fix zipalign/hprof-conv issue in ADT.
| | * | | | | | | | | | | Merge "Fix zipalign/hprof-conv issue in ADT." into idea133Xavier Ducrohet2014-06-216-27/+31
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 2206210 * commit '220621089bd6a7cfac2c3d1a0fa8aeeffc94391b': Fix zipalign/hprof-conv issue in ADT.
| | | * | | | | | | | | | Merge "Fix zipalign/hprof-conv issue in ADT." into idea133Xavier Ducrohet2014-06-206-27/+31
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fix zipalign/hprof-conv issue in ADT.Xavier Ducrohet2014-06-216-27/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files are now in plat-tools. also make tools 23 depend on that new plat-tools and adt/tools 23 require each other. Change-Id: Icdcf3b9f7f0787d385a930f7ebecfcf7049eb3e0
* | | | | | | | | | | | | | am 20cf1572: am 7ad5f75b: Merge "Remove ADT branding from p2 repo" into ↵Siva Velusamy2014-06-221-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | idea133 automerge: 7405c88 * commit '20cf1572d2f9ce3add5fcc82a280b1e67385bb05': Remove ADT branding from p2 repo
| * | | | | | | | | | | | | am 7ad5f75b: Merge "Remove ADT branding from p2 repo" into idea133 ↵Siva Velusamy2014-06-211-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 7405c88 * commit '7ad5f75b8f72dad11109aaa1c9d87795fd44c823': Remove ADT branding from p2 repo
| | * | | | | | | | | | | | Merge "Remove ADT branding from p2 repo" into idea133Siva Velusamy2014-06-211-3/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 7405c88 * commit '7405c88e0c8f5cab2c2ca397dec412e4f03176b1': Remove ADT branding from p2 repo
| | | * | | | | | | | | | | Merge "Remove ADT branding from p2 repo" into idea133Siva Velusamy2014-06-201-3/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Remove ADT branding from p2 repoSiva Velusamy2014-06-211-3/+0
| | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I65a6ab62f3aa90e5c6b17c91ab720c7b1cb92539
* | | | | | | | | | | | | am ef0bcf52: am f2be0827: Merge "Enable large sd cards." into idea133 ↵Xavier Ducrohet2014-06-191-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: b554f97 * commit 'ef0bcf52c35c58d57cccddaf5cb75b6ac39ea97e': Enable large sd cards.
| * | | | | | | | | | | | am f2be0827: Merge "Enable large sd cards." into idea133 automerge: b554f97Xavier Ducrohet2014-06-191-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2be08279ebf962538b05d45e9ba8ae9f7f64846': Enable large sd cards.
| | * | | | | | | | | | | Merge "Enable large sd cards." into idea133Xavier Ducrohet2014-06-191-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: b554f97 * commit 'b554f97341e9ac128bcf23df74667c53fdafb670': Enable large sd cards.
| | | * | | | | | | | | | Merge "Enable large sd cards." into idea133Xavier Ducrohet2014-06-171-0/+4
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Enable large sd cards.Xavier Ducrohet2014-06-191-0/+4
| | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I446336cd4f33bf1959a6bec8803223c8899ef416
* | | | | | | | | | | | | am e119cf16: am 57d14693: Merge "fix AVD Manager name." into idea133 ↵Xavier Ducrohet2014-06-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 306af44 * commit 'e119cf162cfac917b8e6452914c3a96030cefea9': fix AVD Manager name.
| * | | | | | | | | | | | am 57d14693: Merge "fix AVD Manager name." into idea133 automerge: 306af44Xavier Ducrohet2014-06-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '57d14693a1e568c1fb4508d16db13419a8790664': fix AVD Manager name.
| | * | | | | | | | | | | Merge "fix AVD Manager name." into idea133Xavier Ducrohet2014-06-191-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 306af44 * commit '306af449f1bbc5c584daaf2be28ab6baed57ed9c': fix AVD Manager name.
| | | * | | | | | | | | | Merge "fix AVD Manager name." into idea133Xavier Ducrohet2014-06-181-1/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | fix AVD Manager name.Xavier Ducrohet2014-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3062b447167a9d2d479a7205a5236176946d4e54
* | | | | | | | | | | | | | am d12f0f27: am 3ff68051: Merge "Fix find_java." into idea133 automerge: 1b20fb2Xavier Ducrohet2014-06-192-0/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd12f0f27037f4570318b931fcf12033022b1edfd': Fix find_java. monitor: Remove unnecessary plugins during release
| * | | | | | | | | | | | | am 3ff68051: Merge "Fix find_java." into idea133 automerge: 1b20fb2Xavier Ducrohet2014-06-192-0/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3ff68051c62df632a54e0c145f5b702ecaccf990': Fix find_java. monitor: Remove unnecessary plugins during release
generated by cgit v1.1 at 2024-12-23 13:18:33 +0000