aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | | | | | | | * | | | | | | DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of bufferKonstantinos Menychtas2015-07-211-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --- This is a back-port of AOSP change 4a7e93da by Yu Ning; the description of the original patch follows below --- When GPU emulation is enabled, the emulator sometimes freezes, with an error message in logcat similar to the following: QemuPipeStream::readFully failed (buf 0x7f9cd8ab8000): Bad address Some users have reported the same issue, e.g.: https://code.google.com/p/android/issues/detail?id=170633 The root cause is that QemuPipeStream::readFully(void *buf, size_t len) may attempt to read beyond (buf + len), resulting in a -EFAULT return value from the goldfish/qemu pipe driver. Fix this bug to improve the stability of the emulator. In addition, - Add more information to the said error message to facilitate future debugging. - Use "%zu" instead of "%d" for logging size_t variables. Change-Id: I8785fee0427fd6c0f25237470b346e769a82c992 Signed-off-by: Yu Ning <yu.ning@intel.com> Signed-off-by: Pengcheng Chen <pengcheng.chen@intel.com>
* | | | | | | | | | | | | | | | | | | | am b51fc0b2: Merge "adb tab completion: remove extraneous state"Kenny Root2015-07-161-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b51fc0b2f99c1bd53c4c9b635d416b76eaa50838': adb tab completion: remove extraneous state
| * | | | | | | | | | | | | | | | | | | Merge "adb tab completion: remove extraneous state"android-m-preview-2Kenny Root2015-07-161-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | adb tab completion: remove extraneous stateKenny Root2015-07-091-2/+0
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An extraneous state caused adding -s to the command line to have an off-by-one error when trying to tab complete the device serial number. Instead ignore that state in the state machine but still use the state to determine when we should try to get a serial number for completion from adb. Bug: 22353839 Change-Id: I0c67ed6e395ea3689ba2707981c9514c6d5edabb
* | | | | | | | | | | | | | | | | | | am 824c4ac7: Merge "Fix build when OUT_DIR is not set." into studio-1.4-dev ↵Chris Warrington2015-07-071-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: ea12935 automerge: eccf248 * commit '824c4ac758aaaf0d0939b443a1f3c7def808ca2d': Fix build when OUT_DIR is not set.
| * | | | | | | | | | | | | | | | | | Merge "Fix build when OUT_DIR is not set." into studio-1.4-dev automerge: ↵android-m-preview-1Chris Warrington2015-07-071-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea12935 automerge: eccf248 * commit 'eccf2482dde7d13e184af6e0a3e8f9a472c05810': Fix build when OUT_DIR is not set.
| | * | | | | | | | | | | | | | | | | Merge "Fix build when OUT_DIR is not set." into studio-1.4-devChris Warrington2015-07-071-3/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: ea12935 * commit 'ea12935ddad7c8a6dc85e2e6acedaf843649b7a0': Fix build when OUT_DIR is not set.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix build when OUT_DIR is not set." into studio-1.4-devChris Warrington2015-07-071-3/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | Fix build when OUT_DIR is not set.Chris Warrington2015-07-071-3/+4
| | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I75dcdd467e1a4ea4051c98bd5ff9283c8685639f
* | | | | | | | | | | | | | | | | | | | am b0344cf0: Merge "Supporting path specified by build_tools.sh" into ↵Joe Baker-Malone2015-07-071-3/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.4-dev automerge: 6664a90 automerge: 5ffab62 * commit 'b0344cf0ff5f5a29049b20cbdc49664c159ab4d9': Supporting path specified by build_tools.sh
| * | | | | | | | | | | | | | | | | | | Merge "Supporting path specified by build_tools.sh" into studio-1.4-dev ↵Joe Baker-Malone2015-07-071-3/+10
| |\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 6664a90 automerge: 5ffab62 * commit '5ffab62e23a0616c6847afe5eecef5a15b36309b': Supporting path specified by build_tools.sh
| | * | | | | | | | | | | | | | | | | Merge "Supporting path specified by build_tools.sh" into studio-1.4-devJoe Baker-Malone2015-07-071-3/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 6664a90 * commit '6664a90695e05c470fca1ecb8ec134f565781b4d': Supporting path specified by build_tools.sh
| | | * | | | | | | | | | | | | | | | Merge "Supporting path specified by build_tools.sh" into studio-1.4-devJoe Baker-Malone2015-07-071-3/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | Supporting path specified by build_tools.shJoe Baker-Malone2015-07-071-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this is run by build_tools.sh, the out path is specified in an env var. This is the path used for output by previous steps in the script, and this build depends on those outputs being present. Thus currently the build will fail if the out path specified for build_tools.sh doesn't match the hardcoded one here. This change make this build respect the out path env var. Change-Id: I56285c894b80c7b637c484a2cd5c9e2a59d86d5c
* | | | | | | | | | | | | | | | | | | | am 334d9faa: Merge "Proguard: Only keep parcelables if they are used." into ↵Chris Warrington2015-07-072-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.4-dev automerge: 833246f automerge: 014287c * commit '334d9faa135ae4683ba2e4e4c6c53b7b4bcbc74d': Proguard: Only keep parcelables if they are used.
| * | | | | | | | | | | | | | | | | | | Merge "Proguard: Only keep parcelables if they are used." into ↵Chris Warrington2015-07-072-4/+4
| |\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.4-dev automerge: 833246f automerge: 014287c * commit '014287c7727f4d0f1a40d590d19161e4292f5e95': Proguard: Only keep parcelables if they are used.
| | * | | | | | | | | | | | | | | | | Merge "Proguard: Only keep parcelables if they are used." into studio-1.4-devChris Warrington2015-07-072-4/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 833246f * commit '833246fb1b123ab8f3011ae804ee8838e0930b14': Proguard: Only keep parcelables if they are used.
| | | * | | | | | | | | | | | | | | | Merge "Proguard: Only keep parcelables if they are used." into studio-1.4-devChris Warrington2015-07-072-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Proguard: Only keep parcelables if they are used.Chris Warrington2015-06-252-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://code.google.com/p/android/issues/detail?id=175464 Change-Id: I7395246d5bebd34cf0fb547fd1cded8b04c8f195
* | | | | | | | | | | | | | | | | | | am 407771dd: Merge "Track lint API change" into studio-1.4-dev automerge: ↵Tor Norbye2015-07-061-1/+2
|\| | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 131c91c automerge: 3f087d4 * commit '407771ddea7bf210ca9d1c6f91ea93efdbd6d6cb': Track lint API change
| * | | | | | | | | | | | | | | | | Merge "Track lint API change" into studio-1.4-dev automerge: 131c91cTor Norbye2015-07-061-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 3f087d4 * commit '3f087d44fccae54a4ae9fa43c7a67ccc05cb344a': Track lint API change
| | * | | | | | | | | | | | | | | | Merge "Track lint API change" into studio-1.4-devTor Norbye2015-07-061-1/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 131c91c * commit '131c91c90d03aac2176d91a276cef3f7fd7a15a8': Track lint API change
| | | * | | | | | | | | | | | | | | Merge "Track lint API change" into studio-1.4-devTor Norbye2015-07-061-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Track lint API changeTor Norbye2015-07-061-1/+2
| | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I630a21ca2a81aba3e987fdb23184b13f27966f43
* | | | | | | | | | | | | | | | | am d6ce6c1a: Merge "Update version from 24.3.2 -> 24.3.3" into ↵Xavier Ducrohet2015-06-1650-62/+62
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.3-dev automerge: 5d0a70f automerge: 99e3094 * commit 'd6ce6c1a16e7776ad9e13f2ff5f96414c0783ac1': Update version from 24.3.2 -> 24.3.3
| * | | | | | | | | | | | | | | | Merge "Update version from 24.3.2 -> 24.3.3" into studio-1.3-dev automerge: ↵Xavier Ducrohet2015-06-1650-62/+62
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d0a70f automerge: 99e3094 * commit '99e3094b858dc2bd278aec6bfac8425ae3b3b044': Update version from 24.3.2 -> 24.3.3
| | * | | | | | | | | | | | | | | Merge "Update version from 24.3.2 -> 24.3.3" into studio-1.3-devXavier Ducrohet2015-06-1650-62/+62
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 5d0a70f * commit '5d0a70f080894f13f93e87d83062f838cbc59ae1': Update version from 24.3.2 -> 24.3.3
| | | * | | | | | | | | | | | | | Merge "Update version from 24.3.2 -> 24.3.3" into studio-1.3-devgradle_1.3.0-beta4Xavier Ducrohet2015-06-1650-62/+62
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Update version from 24.3.2 -> 24.3.3Siva Velusamy2015-06-1650-62/+62
| | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I758227b9bff0f924862b916d6adaacef494f8696
* | | | | | | | | | | | | | | | | am 249f75b8: Merge "Update version from 24.3.1 -> 24.3.2" into ↵Siva Velusamy2015-06-0950-62/+62
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.3-dev automerge: cbac298 automerge: bc2f9e7 * commit '249f75b8a35b0edab7c6a493ba760a5519b08618': Update version from 24.3.1 -> 24.3.2
| * | | | | | | | | | | | | | | | Merge "Update version from 24.3.1 -> 24.3.2" into studio-1.3-dev automerge: ↵Siva Velusamy2015-06-0950-62/+62
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbac298 automerge: bc2f9e7 * commit 'bc2f9e71dcffa9bbf4420a847c95ebf2d10af316': Update version from 24.3.1 -> 24.3.2
| | * | | | | | | | | | | | | | | Merge "Update version from 24.3.1 -> 24.3.2" into studio-1.3-devSiva Velusamy2015-06-0950-62/+62
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: cbac298 * commit 'cbac29853d42f5cf92740569a98e41c58de83173': Update version from 24.3.1 -> 24.3.2
| | | * | | | | | | | | | | | | | Merge "Update version from 24.3.1 -> 24.3.2" into studio-1.3-devgradle_1.3.0-beta3Siva Velusamy2015-06-0950-62/+62
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Update version from 24.3.1 -> 24.3.2Siva Velusamy2015-06-0950-62/+62
| | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I611a4463d299e4fa3913b235098b24a61a8f3538
* | | | | | | | | | | | | | | | | am 0f88707e: Merge "Update version from 24.3.0 -> 24.3.1" into ↵Siva Velusamy2015-06-0350-62/+62
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.3-dev automerge: 3d39d34 automerge: aa86ea8 * commit '0f88707e3b89cabfd18ce9cc7d5d1bb394f64630': Update version from 24.3.0 -> 24.3.1
| * | | | | | | | | | | | | | | | Merge "Update version from 24.3.0 -> 24.3.1" into studio-1.3-dev automerge: ↵Siva Velusamy2015-06-0350-62/+62
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d39d34 automerge: aa86ea8 * commit 'aa86ea8081bed4b6d38975abf17742ecce27e93e': Update version from 24.3.0 -> 24.3.1
| | * | | | | | | | | | | | | | | Merge "Update version from 24.3.0 -> 24.3.1" into studio-1.3-devSiva Velusamy2015-06-0350-62/+62
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 3d39d34 * commit '3d39d3402c72d368e94fd53d8c1f57c9afa3bb8d': Update version from 24.3.0 -> 24.3.1
| | | * | | | | | | | | | | | | | Merge "Update version from 24.3.0 -> 24.3.1" into studio-1.3-devSiva Velusamy2015-06-0350-62/+62
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Update version from 24.3.0 -> 24.3.1Siva Velusamy2015-06-0350-62/+62
| | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0f4182d662c6fb923a81aefb8b7d71edc2c6f287
* | | | | | | | | | | | | | | | | am cae1bbd1: Merge "Update default enabled tags to match systrace.py" into ↵Siva Velusamy2015-06-011-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.3-dev automerge: 2d3643c automerge: fc1357b * commit 'cae1bbd19adf4415a8fea4be3548af9ab38a68b4': Update default enabled tags to match systrace.py
| * | | | | | | | | | | | | | | | Merge "Update default enabled tags to match systrace.py" into studio-1.3-dev ↵Siva Velusamy2015-06-011-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 2d3643c automerge: fc1357b * commit 'fc1357bc0062a953ceb30e8845e86c2293506c2b': Update default enabled tags to match systrace.py
| | * | | | | | | | | | | | | | | Merge "Update default enabled tags to match systrace.py" into studio-1.3-devSiva Velusamy2015-06-011-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 2d3643c * commit '2d3643c84add866fad105cd26bdb05ec28ef19d6': Update default enabled tags to match systrace.py
| | | * | | | | | | | | | | | | | Merge "Update default enabled tags to match systrace.py" into studio-1.3-devSiva Velusamy2015-06-011-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Update default enabled tags to match systrace.pySiva Velusamy2015-06-011-1/+1
| | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1abdf1d9fddfe2e5ac1771bc919801efd5dd128e
* | | | | | | | | | | | | | | | | am 33affaa5: Merge "21560057: Don\'t enable rs tag by default in systrace ↵Siva Velusamy2015-06-011-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options." into studio-1.3-dev automerge: 67188db automerge: c443a1d * commit '33affaa5e9f9ede62bb2fa06faecdfe9e1539172': 21560057: Don't enable rs tag by default in systrace options.
| * | | | | | | | | | | | | | | | Merge "21560057: Don\'t enable rs tag by default in systrace options." into ↵Siva Velusamy2015-06-011-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.3-dev automerge: 67188db automerge: c443a1d * commit 'c443a1d2f541578b6aeecf57eaa6fcf26964d164': 21560057: Don't enable rs tag by default in systrace options.
| | * | | | | | | | | | | | | | | Merge "21560057: Don\'t enable rs tag by default in systrace options." into ↵Siva Velusamy2015-06-011-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.3-dev automerge: 67188db * commit '67188db991e91c94de8c43b248fa981d940cfaca': 21560057: Don't enable rs tag by default in systrace options.
| | | * | | | | | | | | | | | | | Merge "21560057: Don't enable rs tag by default in systrace options." into ↵Siva Velusamy2015-06-011-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.3-dev
| | | | * | | | | | | | | | | | | | 21560057: Don't enable rs tag by default in systrace options.Siva Velusamy2015-06-011-1/+1
| | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current tracing calls in RenderScript don't properly close tags if there is an exception after opening a tag. So we don't enable it by default. Change-Id: I518da93896e7684efae6644cd6f8de6e6ebc56bb
* | | | | | | | | | | | | | | | | am e769c17c: Merge "Build tools path is now handled by the custom task." ↵Xavier Ducrohet2015-05-211-4/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into studio-1.3-dev automerge: 255cac1 automerge: 1f8d5f4 * commit 'e769c17c424eca35fe19bc46a5f66187293ab50b': Build tools path is now handled by the custom task.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 03:20:44 +0000