aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fixed find_java syntax error on 32-bit machines" into studio-1.1-dev ↵David Herman2014-12-101-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: adf24e0 automerge: 736dc82 * commit '736dc82b50a8bfdd0cc35e5db457e875ceb12eb5': Fixed find_java syntax error on 32-bit machines
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fixed find_java syntax error on 32-bit machines" into studio-1.1-devDavid Herman2014-12-101-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: adf24e0 * commit 'adf24e024be5f87914ffd8575e4b744151eebdbe': Fixed find_java syntax error on 32-bit machines
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fixed find_java syntax error on 32-bit machines" into studio-1.1-devDavid Herman2014-12-101-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed find_java syntax error on 32-bit machinesDavid Herman2014-12-091-1/+1
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related issue: https://code.google.com/p/android/issues/detail?id=82099 Change-Id: I8241eb58d45ceca4b5ada4f5550f79376c716ed6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 6fba68d5: am 2100c690: Merge "emulator/opengl: Remove obsolete directory."David 'Digit' Turner2014-12-09260-43724/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6fba68d554fe6f18910cd27ecb7a28627ca50dd9': emulator/opengl: Remove obsolete directory.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2100c690: Merge "emulator/opengl: Remove obsolete directory."David 'Digit' Turner2014-12-09260-43724/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2100c69072e65a87d69fcef169ea43f86b696bfc': emulator/opengl: Remove obsolete directory.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "emulator/opengl: Remove obsolete directory."David 'Digit' Turner2014-12-08260-43724/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emulator/opengl: Remove obsolete directory.David 'Digit' Turner2014-12-08260-43724/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All sources were moved to external/qemu/distrib/android-emugl to make it easier to modify both the emulator and host libraries at the same time. See: https://android-review.googlesource.com/#/c/118203/ As such, the sources in this directory are now ignored and can be safely removed. Change-Id: I5d143c971f995e2599e5e1d6174030d6803e8080
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 02f3cc34: am 02436ffa: Merge "Update ADT version to 24.0.0." into ↵Tor Norbye2014-12-0453-77/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.0-dev automerge: 4826e23 automerge: d8db65a * commit '02f3cc34682e225fbf9cd6c93c84b2da1e854ea5': Update ADT version to 24.0.0.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 02436ffa: Merge "Update ADT version to 24.0.0." into studio-1.0-dev ↵Tor Norbye2014-12-0453-77/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 4826e23 automerge: d8db65a * commit '02436ffa309ac6cf2daf8df2b50b99fc5261df99': Update ADT version to 24.0.0.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update ADT version to 24.0.0." into studio-1.0-dev automerge: 4826e23Tor Norbye2014-12-0353-77/+77
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: d8db65a * commit 'd8db65a6175ceffeaba2b98e20ed886090ba59b5': Update ADT version to 24.0.0.
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update ADT version to 24.0.0." into studio-1.0-devTor Norbye2014-12-0353-77/+77
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 4826e23 * commit '4826e2328eed423fc840766e5447885b102df82f': Update ADT version to 24.0.0.
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update ADT version to 24.0.0." into studio-1.0-devTor Norbye2014-12-0353-77/+77
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ADT version to 24.0.0.Tor Norbye2014-12-0353-77/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I35126be74bfbbafb3c7acb047b8dc0076bd3b669
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5e5af6c2: am d98dc491: Merge "Update SDK tools version to 24.0.0." into ↵Tor Norbye2014-12-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.0-dev automerge: e36fe4d automerge: 88534dc * commit '5e5af6c2fdf91a641d0e61da4c218a52e49d0732': Update SDK tools version to 24.0.0.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d98dc491: Merge "Update SDK tools version to 24.0.0." into studio-1.0-dev ↵Tor Norbye2014-12-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e36fe4d automerge: 88534dc * commit 'd98dc491321d05327031abe063011f82b10891e2': Update SDK tools version to 24.0.0.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update SDK tools version to 24.0.0." into studio-1.0-dev automerge: ↵Tor Norbye2014-12-031-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e36fe4d automerge: 88534dc * commit '88534dc4bbe54d5718f8e6794ae3ff5060b4a170': Update SDK tools version to 24.0.0.
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update SDK tools version to 24.0.0." into studio-1.0-devTor Norbye2014-12-031-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e36fe4d * commit 'e36fe4d0a80a681e1d5a1df4127f4557374dfb0a': Update SDK tools version to 24.0.0.
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update SDK tools version to 24.0.0." into studio-1.0-devTor Norbye2014-12-031-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update SDK tools version to 24.0.0.Tor Norbye2014-12-031-1/+1
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I402888c46408c81faef34a547ba54b19a78f77e5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2e7630d0: am 6e909dbb: Merge "80481: Update Gradle Export from Eclipse to ↵Tor Norbye2014-12-033-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handle 1.0" into studio-1.0-dev automerge: fde8b7e automerge: 8c7d974 * commit '2e7630d0bbd149750bf3aa6f066b114552d312e6': 80481: Update Gradle Export from Eclipse to handle 1.0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 6e909dbb: Merge "80481: Update Gradle Export from Eclipse to handle 1.0" ↵Tor Norbye2014-12-023-7/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into studio-1.0-dev automerge: fde8b7e automerge: 8c7d974 * commit '6e909dbb16b137b08545df345c3fcffd262ffc7f': 80481: Update Gradle Export from Eclipse to handle 1.0
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "80481: Update Gradle Export from Eclipse to handle 1.0" into ↵Tor Norbye2014-12-023-7/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.0-dev automerge: fde8b7e automerge: 8c7d974 * commit '8c7d974a43d11a4efe756120cb7159f6bff24cae': 80481: Update Gradle Export from Eclipse to handle 1.0
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "80481: Update Gradle Export from Eclipse to handle 1.0" into ↵Tor Norbye2014-12-023-7/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.0-dev automerge: fde8b7e * commit 'fde8b7e27492ae697ccb844b1bff0784b1c21305': 80481: Update Gradle Export from Eclipse to handle 1.0
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "80481: Update Gradle Export from Eclipse to handle 1.0" into ↵Tor Norbye2014-12-023-7/+8
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.0-dev
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80481: Update Gradle Export from Eclipse to handle 1.0Tor Norbye2014-12-023-7/+8
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib62817d9c906adf8d893773027a34590a2bf56ed
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 68818797: am 2ba8c643: Merge "Update ADT version to 23.0.6" into ↵Tor Norbye2014-12-0253-77/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.0-dev automerge: e3ce02c automerge: 98504b9 * commit '688187972dee9bb3c2a3942e2c68b8f96acaf482': Update ADT version to 23.0.6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2ba8c643: Merge "Update ADT version to 23.0.6" into studio-1.0-dev ↵Tor Norbye2014-12-0253-77/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e3ce02c automerge: 98504b9 * commit '2ba8c643879ee669faca60646ba88b3232dff127': Update ADT version to 23.0.6
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update ADT version to 23.0.6" into studio-1.0-dev automerge: e3ce02cTor Norbye2014-12-0253-77/+77
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 98504b9 * commit '98504b9868363514046be020560941a3b5559194': Update ADT version to 23.0.6
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update ADT version to 23.0.6" into studio-1.0-devTor Norbye2014-12-0253-77/+77
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e3ce02c * commit 'e3ce02cf56a1859340849da3cb245a35413bb76d': Update ADT version to 23.0.6
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update ADT version to 23.0.6" into studio-1.0-devTor Norbye2014-12-0253-77/+77
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ADT version to 23.0.6Tor Norbye2014-11-2653-77/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I23d62d1778b798711d1ad666db3bead193f90ef2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1d32afb0: am 9087b1ed: Merge "72760: Lint errors prevent exporting of ↵Tor Norbye2014-12-017-11/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | application" into studio-1.0-dev automerge: 0cdf275 automerge: ee7091b * commit '1d32afb04fe156cba653174b0f73b7395ed00504': 72760: Lint errors prevent exporting of application
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 9087b1ed: Merge "72760: Lint errors prevent exporting of application" ↵Tor Norbye2014-12-017-11/+78
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into studio-1.0-dev automerge: 0cdf275 automerge: ee7091b * commit '9087b1ed6f231546ef09185486486c7386f1039c': 72760: Lint errors prevent exporting of application
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "72760: Lint errors prevent exporting of application" into ↵Tor Norbye2014-12-017-11/+78
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.0-dev automerge: 0cdf275 automerge: ee7091b * commit 'ee7091b02647bec3ce00212d20bc4629485738c7': 72760: Lint errors prevent exporting of application
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "72760: Lint errors prevent exporting of application" into studio-1.0-devTor Norbye2014-12-017-11/+78
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 0cdf275 * commit '0cdf275882a0595e5559682d56d43d5061365fef': 72760: Lint errors prevent exporting of application
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "72760: Lint errors prevent exporting of application" into studio-1.0-devTor Norbye2014-12-017-11/+78
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72760: Lint errors prevent exporting of applicationTor Norbye2014-11-267-11/+78
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I710982520f2ac40674dca7f63760f525051342a2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f20c52d1: am 9f487777: Merge "emulator/opengl: Fix Windows cross-build."David 'Digit' Turner2014-12-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f20c52d1acc6719428f3d2d8aa4562721d63e9f8': emulator/opengl: Fix Windows cross-build.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 9f487777: Merge "emulator/opengl: Fix Windows cross-build."David 'Digit' Turner2014-12-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9f48777705fe9f234ea0852b5994e56a7395c309': emulator/opengl: Fix Windows cross-build.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "emulator/opengl: Fix Windows cross-build."David 'Digit' Turner2014-12-011-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emulator/opengl: Fix Windows cross-build.David 'Digit' Turner2014-12-011-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building the host version of the gtest library, always include -lpthread as part of LOCAL_LDLIBS, otherwise the build will fail when cross-compiling for Windows on Linux. Change-Id: I8614f9e6d543dbba910b9495d6c1bd59e7c61004
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c4eac7b3: am b8f9fbd1: Merge changes I58865946,I582d5ab6,Ib1b6bcbaDavid 'Digit' Turner2014-11-2832-112/+514
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c4eac7b337761c361421b350549a434b0116369e': emulator/opengl: Fix pixelDataSize() ambiguity. emulator/opengl: Update declarations to fix const issue. emulator/opengl/emugen: Fix type parsing.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b8f9fbd1: Merge changes I58865946,I582d5ab6,Ib1b6bcbaDavid 'Digit' Turner2014-11-2832-112/+514
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b8f9fbd141ca6d878d5d3f4525e53bd0a2ee16ef': emulator/opengl: Fix pixelDataSize() ambiguity. emulator/opengl: Update declarations to fix const issue. emulator/opengl/emugen: Fix type parsing.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes I58865946,I582d5ab6,Ib1b6bcbaDavid 'Digit' Turner2014-11-2832-112/+514
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: emulator/opengl: Fix pixelDataSize() ambiguity. emulator/opengl: Update declarations to fix const issue. emulator/opengl/emugen: Fix type parsing.
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emulator/opengl: Fix pixelDataSize() ambiguity.David 'Digit' Turner2014-11-282-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this fix, the GLESv1 encoder library will link to the pixelDataSize() function that is defined in the GLESv2 encoder library, which results in bugs, like the boot animation now showing with -gpu on. This patch doesn't change the generated decoder libraries, nor does it affect the encoder ones until external/qemu/distrib/update-emugl-sources.sh is called. When the latter script will be run, other changes under device/generic/goldfish/generic/ will be needed to fix the namespace of the functions being defined in GLEncoderUtils.cpp and GL2EncoderUtils.cpp Change-Id: I588659461dd6d73350d150a896494ccf50fbdc7f
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emulator/opengl: Update declarations to fix const issue.David 'Digit' Turner2014-11-286-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch modifies a few GLESv1 and GLESv2 function declaration to use the correct constness for the parameters of a few functions. This fixes build breaks when the generated encoders are used with recent Khronos headers. Change-Id: I582d5ab6d85fd18e6d6dce27b9a08f38b026f916
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emulator/opengl/emugen: Fix type parsing.David 'Digit' Turner2014-11-2826-93/+493
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the parsing of type declarations and parameter declarations to: - Properly recognize complicated types like 'const int* const*' which previously required omitting spaces (e.g. 'const int*const*') to be recognized by the parser. - Normalize the type strings (e.g. 'const char **items' -> 'const char** items') - Add a unit test program (emugen_unittests) to check emugen's internal functions. For now this only applies to the new functions introduced in the new header Parser.h + Update emugen test suite accordingly. Change-Id: Ib1b6bcbae97e1ee7d8b272843dfb5926d2d98fd2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 4e9b33d3: am a01dd53f: Merge "Correctly set error code" into ↵bohu2014-11-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.0-dev automerge: 7b26ed5 automerge: 2cd704d * commit '4e9b33d30862f294b0ecbf3f4ac4d46b402859f2': Correctly set error code
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a01dd53f: Merge "Correctly set error code" into studio-1.0-dev automerge: ↵bohu2014-11-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b26ed5 automerge: 2cd704d * commit 'a01dd53f93a56259ab600266b67ee387e1795629': Correctly set error code
generated by cgit v1.1 at 2025-08-17 21:22:04 +0000