summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-03-31Manifest for studio 2.0 RC1studio-2.0-rc1studio-2.0-rc1The Android Open Source Project
2016-03-31Update manifest for studio-master-dev.The Android Open Source Project
2015-11-19Manifest for studio-master-dev on 1.5 releaseBill Yi
Change-Id: Id57b46e1691c9c1ea5958ed5a96f11508e9c54a2
2015-10-03Manifest for studio-master-devBill Yi
Change-Id: I15289b824beb142d726e494a131229428f60b5e3
2015-07-24Add prebuilts projectsBill Yi
automerge: fa187d5 -s ours * commit 'fa187d5c175b11954fd2304310d23e2dd3be9b55': Add prebuilts projects
2015-07-22Add prebuilts projectsBill Yi
Change-Id: Ib6c55239eff2df155cde3cbffcaf71ce8c1c2be7
2015-07-17Add external/iosched.Xavier Ducrohet
Change-Id: I76ea2e45823fbcb9e915b60a16c92c5140d5e11c
2015-07-17Clean up gpl xml files automerge: ddd4126Bill Yi
automerge: b0dc33f * commit 'b0dc33f6a0ca04244968ab4b1c21c27d44ffa297': Clean up gpl xml files
2015-07-17Add platform/prebuilts/clang/darwin-x86/sdk/3.5 automerge: 06e5a71 -s ours ↵Bill Yi
automerge: 7ab608d automerge: 8ab943d * commit '8ab943dc3fb62da6b66212c170932ef42791d754': Add platform/prebuilts/clang/darwin-x86/sdk/3.5
2015-07-17Remove platform/tools/gpu automerge: ff49edd -s ours automerge: 33696f7Bill Yi
automerge: bd6df63 * commit 'bd6df636db47870dce5b904d4633050a3bcf59da': Remove platform/tools/gpu
2015-07-17Use default revision for platform/external/qemu-android automerge: cf98bde ↵The Android Open Source Project
automerge: 2fb1dfa automerge: 2e0d64b * commit '2e0d64ba042cdd7ab4e8bbac65ea3041c44d0c02': Use default revision for platform/external/qemu-android
2015-07-17Add external/qemu-android to manifest. automerge: dfb4fa0 -s ours ↵David 'Digit' Turner
automerge: bb7fe69 automerge: 4c1298b * commit '4c1298b931a09bfb4b6c2b8068e50e922866eed4': Add external/qemu-android to manifest.
2015-07-17Use default branch for prebuilts/android-emulator-build/* automerge: 7597850Bill Yi
automerge: 807711f * commit '807711f33810ffb4c71450ebd631cdf18b594435': Use default branch for prebuilts/android-emulator-build/*
2015-07-17Add platform/tools/studio/google/services automerge: 6011db8Bill Yi
automerge: e7c2c46 * commit 'e7c2c46ac7e4ba1940a504400b30b9f099ab7014': Add platform/tools/studio/google/services
2015-07-17Clean up gpl xml filesBill Yi
automerge: ddd4126 * commit 'ddd41260512c2a0e693d69331d5b1cf345869097': Clean up gpl xml files
2015-07-17Add platform/prebuilts/clang/darwin-x86/sdk/3.5 automerge: 06e5a71 -s oursBill Yi
automerge: 7ab608d * commit '7ab608d480b059ea884d25a459747164a6caf018': Add platform/prebuilts/clang/darwin-x86/sdk/3.5
2015-07-17Remove platform/tools/gpu automerge: ff49edd -s oursBill Yi
automerge: 33696f7 * commit '33696f7007d36df84f1078ef98d43e4e4dee6ef4': Remove platform/tools/gpu
2015-07-17Use default revision for platform/external/qemu-android automerge: cf98bdeThe Android Open Source Project
automerge: 2fb1dfa * commit '2fb1dfa654fade682bf34398a14de6fa88ac39b7': Use default revision for platform/external/qemu-android
2015-07-17Add external/qemu-android to manifest. automerge: dfb4fa0 -s oursDavid 'Digit' Turner
automerge: bb7fe69 * commit 'bb7fe696e99de2bdaca0ef4ad119f86b4b76863a': Add external/qemu-android to manifest.
2015-07-17Use default branch for prebuilts/android-emulator-build/*Bill Yi
automerge: 7597850 * commit '759785041d00f006235eb6c97c10b5ff80a39c68': Use default branch for prebuilts/android-emulator-build/*
2015-07-17Add platform/tools/studio/google/servicesBill Yi
automerge: 6011db8 * commit '6011db8f5697cc7110304be15986b2d6f9af9dbf': Add platform/tools/studio/google/services
2015-07-16Clean up gpl xml filesBill Yi
Change-Id: Icc10dd1c24479d6045453631f2d1b194e86aef4d
2015-07-16DO NOT MERGE ANYWHERE. this is to stop merger to try to merge all the ↵Qiwen Zhao
changes already on the branch. Merge remote-tracking branch 'origin/studio-1.4-dev' into studio-master-dev
2015-07-16added new folder for prebuilt emulatorVince Harron
automerge: d467cd4 -s ours * commit 'd467cd4d24d9e66e86901aee25cc9425040da44d': added new folder for prebuilt emulator
2015-07-16add external/emma.Xavier Ducrohet
automerge: 4ed62cf -s ours * commit '4ed62cfb1d31b8bed453cde0895be653a55837f7': add external/emma.
2015-07-16Add platform/prebuilts/clang/darwin-x86/sdk/3.5Bill Yi
automerge: 06e5a71 -s ours * commit '06e5a719cfdebfc34d85a9d0b2fc00e668ac5fe3': Add platform/prebuilts/clang/darwin-x86/sdk/3.5
2015-07-16Add ant-glob and eclipse-windowbuilder to ub-tools-idea133Siva Velusamy
automerge: 63cf14e * commit '63cf14ebf45609f6a05be472fa2c76eec3ab493f': Add ant-glob and eclipse-windowbuilder to ub-tools-idea133
2015-07-16Sort projects in alphabetical orderBill Yi
automerge: c9ca68d -s ours * commit 'c9ca68d006a8a969e534e1b7bca5a73c74bbca1e': Sort projects in alphabetical order
2015-07-16Remove platform/tools/gpuBill Yi
automerge: ff49edd -s ours * commit 'ff49edd1d3b3064063edfc9b6a661d1dc867e47d': Remove platform/tools/gpu
2015-07-16Use revision master for platform/prebuilts/qemu-kernelBill Yi
automerge: f46c7c4 -s ours * commit 'f46c7c41f4758aae45e0132b06ecad420ea48aa0': Use revision master for platform/prebuilts/qemu-kernel
2015-07-16Use default revision for platform/external/qemu-androidThe Android Open Source Project
automerge: cf98bde * commit 'cf98bde2f241d0da1e8edb8ca2a40379a8f99132': Use default revision for platform/external/qemu-android
2015-07-16Add external/qemu-android to manifest.David 'Digit' Turner
automerge: dfb4fa0 -s ours * commit 'dfb4fa0eb7febac465f1bb4862ea650e7661e908': Add external/qemu-android to manifest.
2015-07-16Add platform/prebuilts/qemu-kernelBill Yi
automerge: 9556f50 -s ours * commit '9556f5092a5d6a86d1eb5446a579d64238b57023': Add platform/prebuilts/qemu-kernel
2015-07-16Add external/iosched.Xavier Ducrohet
Change-Id: I2073fd6670d8175c796d0b96b1eb12b976e1bd46
2015-06-11Added lldb reposVince Harron
2015-06-10Add prebuilts/android-emulator-build/*Bill Yi
Change-Id: I67f2109ff855fc926bc2bf3f75fb5bb3dae4cb16
2015-06-10Use default branch for prebuilts/android-emulator-build/*Bill Yi
BUG: 21755422 Change-Id: I8b18e3f4443f5d6108a7043d09871f5eb6c20828
2015-06-10Use default branch for prebuilts/android-emulator-build/*Bill Yi
BUG: 21755422 Change-Id: I8b18e3f4443f5d6108a7043d09871f5eb6c20828
2015-06-03Add platform/tools/studio/google/servicesBill Yi
Change-Id: I094950dd9de552b2f83b4b877a518ce7dafbbecc
2015-06-03Add platform/tools/studio/google/servicesBill Yi
Change-Id: I094950dd9de552b2f83b4b877a518ce7dafbbecc
2015-06-03Add platform/tools/studio/google/servicesBill Yi
Change-Id: I094950dd9de552b2f83b4b877a518ce7dafbbecc
2015-06-02Manifest for studio-1.4-devBill Yi
Change-Id: I17d595960307bcade725d71fd42b8bd0e6f2c737
2015-05-07Add platform/prebuilts/android-emulator-build projectsBill Yi
Change-Id: I9597bdc4f59e98f77ea5eef761310949f7326126
2015-05-07Add platform/prebuilts/android-emulator-build projectsBill Yi
Change-Id: I2512acbc08c863e72e74a0d3ed544e9ffa9751d2
2015-05-05Add platform/prebuilts/clang/darwin-x86/sdk/3.5Bill Yi
Change-Id: I50a7daade7fa9e59749b88ff8c74e804914013bd
2015-05-05Add platform/prebuilts/clang/darwin-x86/sdk/3.5Bill Yi
Change-Id: I30df6e7564bbe43d96d902b80a5f7f95b0f65da8
2015-05-05Add platform/prebuilts/clang/darwin-x86/sdk/3.5Bill Yi
Change-Id: I50a7daade7fa9e59749b88ff8c74e804914013bd
2015-04-22Added 'gpu' group tag to Mac clang toolchain.Brent Austin
2015-03-23Add platform/prebuilts/go/windows-x86Bill Yi
Change-Id: Icbcbb5f3e85deeffe277f24e09cedeb3b78065f3
2015-03-23Add platform/prebuilts/go/windows-x86Bill Yi
Change-Id: I677772275db15930c2b17d107153d939efda40b5