aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Snap for 5335706 from d4e54c121f49d73c9e18aff087ce3dbafc2eab47 to qt-releaseandroid-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r1android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-mainline-releaseandroid10-mainline-a-releaseandroid10-gsiandroid-build-team Robot2019-02-260-0/+0
|\ | | | | | | Change-Id: I10c27aa3c879cace36b8cc5bfb584a01ac4fe69a
| * Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li2019-02-250-0/+0
| |\ | | | | | | | | | | | | | | | am: 81689c30c1 Change-Id: I4f76c9dbdafbe48b33e8e3da38df13493a50bc15
| | * Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| | |\ | | | | | | | | | | | | | | | | Bug: 126125118 Change-Id: I49cc400530b077570e154ee48a8ee0d863b144e1
| | | * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: I1d7b3656360216363268c3d194ac60b82347bd77
* | | | | Snap for 5289249 from 57bfcfc88934d2fd218f2d8086a715aa2152a423 to qt-releaseandroid-build-team Robot2019-02-0724-454/+724
|\| | | | | | | | | | | | | | | | | | | Change-Id: I0c6cd3a33d9f84b4055245fbcbc0c93add4f81d2
| * | | | Upgrade Microsoft-GSL to 7d78b743e43ecba06ca47426d03d9d16076dec16 am: ↵Haibo Huang2019-02-0624-454/+724
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74a0cce77f am: ecd8510391 am: 7da53d1953 Change-Id: Ibe2f0a777eb77a31a5b3933e816dabe020591aa2
| | * | | Upgrade Microsoft-GSL to 7d78b743e43ecba06ca47426d03d9d16076dec16 am: 74a0cce77fHaibo Huang2019-02-0624-454/+724
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: ecd8510391 Change-Id: Ibeed93f1b83b0172f60b016d1ac39798648e3412
| | | * | Upgrade Microsoft-GSL to 7d78b743e43ecba06ca47426d03d9d16076dec16Haibo Huang2019-02-0624-454/+724
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 74a0cce77f Change-Id: Ifcdc23f95b943536b5fd6496ddd9111f0e6ff324
| | | | * \ Upgrade Microsoft-GSL to 7d78b743e43ecba06ca47426d03d9d16076dec16android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.10Haibo Huang2019-02-0324-454/+724
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: build Change-Id: Id3bb661f960ea8dd518dbadf782336472eea218e
| | | | | * | added clang7.0 to Travis configuration and README (#763)Anna Gringauze2019-01-162-1/+27
| | | | | | |
| | | | | * | Clang cl (#762)Anna Gringauze2019-01-1517-106/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added c++17 test configurations for clang5.0 and clang6.0 * Fix #739 correct cppcorecheck warnings for clang-cl * Add clang-cl configurations * Corrections Appveyor; Temporarily disable msvc compilation for faster testing (#741) * Add path to clang-cl.exe (#741) * Escape backslash in path (#741) * Update vcpkg (#741) * Check vcpkg version; try without building vcpkg; use latest clang-cl from path (#741) * Fix blocks in ps script (#741) * Try accessing APPVEYOR_BUILD_FOLDER variable (#471) * Update span size() bug confirmation test for GCC 6.5 (#741) * MSVC flags to Clang-cl; disable c++98-compat and undefined macro warnings (#741) * Suppress clang warning on tests (missing-prototypes) (#741) * Fix clang warning -Wnewline-eof (#741) * Fix clang warning -Wdouble-promotion (#741) * Set linker explicitly * Clean condition statement * For Clang, fallback to the AppVeyor installed version of CMake * Fix clang warning -Wmissing-variable-declarations * Fallback to the MSVC linker until vcpkg has been updated * Revert "Fallback to the MSVC linker until vcpkg has been updated" This reverts commit 7263f3289e6e835c32fc7800d0c2d4e58bd21178. * Fix clang warning -Wunused-member-function * Fix clang warning -Wmissing-noreturn * Fix clang warning -Winvalid-noreturn on Windows * Add macro block end comment on large #if blocks * Workaround: fallback to mscv link.exe * Workaround: get msvc paths into PowerShell through intermediate file * Workaround: fix, remove "PATH=" from text * Workaround: try with full-path; and return user PATH * Workaround: fix, escape backslashes * Revert all since "Workaround: fallback to mscv link.exe" did not work on AppVeyor This reverts the commits: bda3d6a428e5d19e97375b2e575b0f51ff1b4bc0 97062933acfb6428535c0fdcab5d94371ce72bfc 0f4fb04bac9c2d091005b791294237250dbe0668 1b0c19afd154f4ffc5ef793014c1bc2324534fd0 a5739ea5f0cd7633527b5e5d3b16a9e3ade7149f * Suppress output of git pull; remove vcpkg from cache * Re-enable AppVeyor builds for all platforms * Correct typo Co-Authored-By: Farwaykorse <Farwaykorse@users.noreply.github.com> * Add Clang-cl 7.0.0 to the supported platforms * Revert "Fix clang warning -Wunused-member-function" This reverts commit 6fe1a4203501145ab4350b9152ecc11f3a30e49a. * Fix or locally suppress clang warning -Wunused-member-function * format touched code and correct comment * git pull --quiet * fix logic error in workaround * fix missing bracket * Suppress output of mkdir * Replace MSBuild with Ninja * Suppress output of 7z * Add architecture flags for Clang * Drop workaround for lld-link * 7-zip Overwrite and Alternative output suppression without suppressing errors Replaces 3c1c0794dd9a29908cc7c38f591bd3c7b4929677 * AppVeyor setup and CMake before build * reorder compiler configuration * remove unnecessary * remove -fno-strict-aliasing * remove -Wsign-conversion, since before v4.0 part of -Wconversion * -Wctor-dtor-privacy is GCC only * remove -Woverloaded-virtual part of -Wmost, part of -Wall * add -Wmissing-noreturn * remove the pragmas for -Wunused-member-function * Re-add MSBuild generator on AppVeyor * Print CMake commands * Add MSBuild toolset selection * Separate Architecture setting * clang-cl: add -Weverything * clang-cl -Wno-c++98-compat * clang-cl -Wno-c++98-compat-pedantic * clang-cl -Wno-missing-prototypes * clang-cl C++14 -Wno-unused-member-function * clang-cl -Wundef __GNUC__ * clang++: add -Weverything * clang++ -Wno-c++98-compat * clang++ -Wno-c++98-compat-pedantic * clang++ -Wno-missing-prototypes * clang++ -Wno-weak-vtables * clang++ C++14 -Wno-unused-member-function * clang++ fix -Wundef _MSC_VER * clang++ -Wno-padded * clang++ solve -Wdeprecated * Add AppleClang compiler target Since CMake v3.0 use of Clang for both is deprecated * clang++ v5.0 C++17 -Wno-undefined-func-template * Add VS2015 + LLVM/clang-cl to AppVeyor * Do not disable constexpr when compiling with clang-cl on Windows * Clean-up clang-only warnings (now under -Weverything) * Revert "Fix clang warning -Winvalid-noreturn on Windows" This reverts commit 2238c4760e86feebb2a18620b77312bd01055f61. * Suppress -Winvalid-noreturn for the MS STL noexception workaround * CMake: put preprocessor definition in target_compile_definitions * Solve compiler warning C4668: __GNUC__ not defined
| | | | | * | Make narrow constexpr (#698)Johel Ernesto Guerrero Peña2019-01-142-0/+13
| | | | | | |
| | | | | * | Dev/annagrin/remove explicit not null constructor (#743)Anna Gringauze2019-01-148-292/+385
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added c++17 test configurations for clang5.0 and clang6.0 * Removed explicit not_null constructor, sloppy_not_null, added strict_not_null We added explicit not_null constructor in version 2.0.0. It proved very difficult to switch to the new version for large code bases that adopted previous versions of gsl, due to not_null used extensively in the code. Still, using explicit constructor is very benefitial for new code, since it encorages better API design and make null checks intentional. To resolve the issue, this change: - removes explicit keyword from not_null constructor - removes unneded sloppy_not_null type - adds strict_not_null type to behave the same way as v2 not_null - updates tests * Removed explicit not_null constructor, sloppy_not_null, added strict_not_null We added explicit not_null constructor in version 2.0.0. It proved very difficult to switch to the new version for large code bases that adopted previous versions of gsl, due to not_null used extensively in the code. Still, using explicit constructor is very benefitial for new code, since it encorages better API design and make null checks intentional. To resolve the issue, this change: - removes explicit keyword from not_null constructor - removes unneded sloppy_not_null type - adds strict_not_null type to behave the same way as v2 not_null - updates tests * fixed build break for gcc7 * added more tests * added more non-compiling tests * Addressed PR comments and suppressed a code analysis warning * Fixed test failure in not_null tests
| | | | | * | Make CheckRange constexpr (#754) (#755)Alex Green2019-01-141-1/+1
| | | | | | |
| | | | | * | Fixes CMAKE_VERSION check (#759)k-brac2019-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes CMAKE_VERSION check Fixes #758 by using the correct comparison operator for a version See documentation at https://cmake.org/cmake/help/latest/command/if.html Thanks to this change, gsl natvis is properly included in a visual studio solution * cmake version check for cmake < 3.7
| | | | | * | Suppress Warnings in GSL Headers (#731)hannesweisbach2018-11-281-5/+15
| | | | | | | | | | | | | | | | | | | | | Suppress warnings in GSL headers using the SYSTEM keyword for target_include_directories(). This enables developers to see warnings standalone builds but hides them from users in non-standalone builds.
| | | | | * | added noexcept to get rid off VC warning con.4 (#748)beinhaerter2018-11-281-1/+1
| | | | | | |
| | | | | * | Fix spelling of library name (#747)Stefan Dinkelacker2018-11-281-2/+2
| | | | | | |
| | | | | * | Use the c++17 constexpr if in CheckRange if possible (#753)kile02018-11-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * change c++17 to use constexpr if in CheckRange * remove unnecessary macro * use the portable feature test macro rather than direct version check
| | | | | * | Dev/annagrin/fix span size test gcc (#750)Anna Gringauze2018-11-271-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added c++17 test configurations for clang5.0 and clang6.0 * fixed test for broken span.size() in gcc6.5
| | | | | * | Span can be constructed from empty std::array safely (#686)Dave Hill2018-11-052-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Span std::array c'tor uses arr.data() instead of &arr[0] - Fixes runtime issues when constructing from an empty std::array * Construct span with std::data if C++17 detected * Specialize span c'tor for std::array of length 0, set storage to nullptr
| | | | | * | make BoundsRanges constexpr (#732)Ian Taylor2018-11-051-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * make BoundsRanges constexpr * fix clang compilation error * fix windows compilation
* | | | | | | Snap for 5246489 from d9df5e4b3133636d1de26cf6f34e2b6151a12432 to qt-releaseandroid-build-team Robot2019-01-201-4/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie56dd3b40cc5da190718c72aabce4a9c7af9bc0c
| * | | | | | Switch to system/core/janitors as OWNERS. am: 9773e9ce0b am: 698e6f69e4Elliott Hughes2019-01-171-4/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 311596d83b Change-Id: Ib7685f4bd812ce84a0f418981ab9b16fe4ed4a8a
| | * | | | | Switch to system/core/janitors as OWNERS. am: 9773e9ce0bElliott Hughes2019-01-171-4/+1
| | |\| | | | | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | am: 698e6f69e4 Change-Id: Id6c8577e9e74162d0f7dbd85b52c95f080ed5bad
| | | * | | Switch to system/core/janitors as OWNERS.Elliott Hughes2019-01-171-4/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9773e9ce0b Change-Id: I6dfcca0c65898d4170135a577ed3d84b7a0f26b1
| | | | * | Switch to system/core/janitors as OWNERS.Elliott Hughes2019-01-171-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icb6790170262b387354403073f5ffa4c486d082d
* | | | | | Snap for 5220519 from 888ea492b9fef8b24b1c2b75241556d0369c5de6 to qt-releaseandroid-build-team Robot2019-01-101-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia43fe7138c804793752ea55a75b34138106ac3a6
| * | | | | Add default code reviewers into OWNERS am: f85dcb01c2 am: 2e90ed4963Chih-Hung Hsieh2019-01-081-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 787280a337 Change-Id: I7cf8d3ba95d83fed756570d96124bcf23a565966
| | * | | | Add default code reviewers into OWNERS am: f85dcb01c2Chih-Hung Hsieh2019-01-081-0/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2e90ed4963 Change-Id: I9ffbff6546d3ba13d9c67d3256cced13ec3a1ca6
| | | * | | Add default code reviewers into OWNERSChih-Hung Hsieh2019-01-081-0/+4
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f85dcb01c2 Change-Id: I9d993b0e39db24941304e1709df621cd554f3e83
| | | | * | Add default code reviewers into OWNERSChih-Hung Hsieh2019-01-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 33166666 Test: gerrit uploader Change-Id: Ib4bcba53e6b4a36174192f7701fe8249eb834323
* | | | | | Snap for 5096429 from 4a9132228fdb027c1a08fa36b419f406203eacc1 to qt-releaseandroid-build-team Robot2018-10-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie8a7cf6fed473491fa4e48b7215c5b454101a578
| * | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: 8a14b6e73d -s ours am: e5dbac0e90 -s ours am: 8cd2165fdd -s ours Change-Id: Ifc4a6b0c6734f868e059fa8376991b7e41e74c97
| | * | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: 8a14b6e73d -s ours am: e5dbac0e90 -s ours Change-Id: I02f03b4fb9f2f03ca3c5560c35acd7ea426fb161
| | | * | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8a14b6e73d -s ours Change-Id: If1fae68a234f000f2bb25e36bec8135754d9ffbe
| | | | * | Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Bill Yi2018-10-240-0/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I37f6660cbe9fd0db35459082600ea56caf636996
* | | | | | | Snap for 5090430 from 85a0e6a1f28481398721162d517a805e6f1ce6b7 to qt-releaseandroid-build-team Robot2018-10-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5bee5ec812a6af7e63805d37dd4d979d891ae55b
| * | | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: 70c0e33a9d -s ours am: 06a8e482ba -s ours Change-Id: Icf66c53148e3399a49f9364f54d83f1ce40da475
| | * | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: 70c0e33a9d -s ours Change-Id: I195c6eab38c67316e82dfca1aa4b664e36b18a74
| | | * | | | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | | |\ \ \ \ | | | | |/ / / | | | |/| / / | | | | |/ / Change-Id: Iaaa8b1c96ed9ea454a8aeb76ab50b1c36a54fdaf
| | | | * | Snap for 4462748 from 2ef7b8a9e35e409b175e190298cde5434155f54a to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r3android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot2017-11-212-0/+21
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I647346194081cd7e0fb52f9ae1257c80ab720193
| | | | * \ \ Snap for 4453288 from 6034061d9a194ad027e595c4e194ac027cad5894 to pi-releaseandroid-build-team Robot2017-11-150-0/+0
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a59f9464532e49da192adadf4d9233e63cf2be4
| | | | * \ \ \ Snap for 4439972 from c5b157244006a76d2af7ff3809f387ac9482ef92 to pi-releaseandroid-build-team Robot2017-11-081-0/+1
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie045ff4e33494be69215ecb599a2ddd049bfc36c
| | | | * \ \ \ \ release-request-d4f45cf4-9d73-4828-baa4-f73aa4280cd0-for-git_pi-release-4241 ↵android-build-team Robot2017-08-0333-5122/+5979
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 208 snap-temp-L10800000088711883 Change-Id: I79d6f4cdf0e0684ef706b10eb9e0f335bbf3e68c
* | | | | | | | | | Snap for 4989423 from 858199a616e08efad6681abaf8bdd106873b52be to qt-releaseandroid-build-team Robot2018-09-0236-1734/+3296
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5926e9db6731862178feb0ab0ecb66501d7e86e7
| * | | | | | | | | Merge remote-tracking branch 'aosp/upstream-master'. am: 9f5bbf2d42 am: ↵Elliott Hughes2018-08-3036-1734/+3296
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 034612fe23 am: d77b4f7b23 Change-Id: I4ae28ee08d04994eb0f1aba517032c6addaf4ed3
| | * | | | | | | | Merge remote-tracking branch 'aosp/upstream-master'. am: 9f5bbf2d42Elliott Hughes2018-08-3036-1734/+3296
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 034612fe23 Change-Id: I133ac7d4edc5f834ef91fabdfd9288b84ab875c9
| | | * | | | | | | Merge remote-tracking branch 'aosp/upstream-master'.Elliott Hughes2018-08-3036-1734/+3296
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9f5bbf2d42 Change-Id: Ia1c0f675ece61b7ab05a535ffc4288568985693e
| | | | * \ \ \ \ \ \ Merge remote-tracking branch 'aosp/upstream-master'.android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseElliott Hughes2018-08-3036-1734/+3296
| | | | |\ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: https://issuetracker.google.com/113072504 Change-Id: I44441d1be2d5e40d66c61e9c60f04d6279b2e5f7