summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge stage-aosp-master into pi-dev-plus-aospHEADandroid-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r11android-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_r12ndk-sysroot-r21masterandroid10-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-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li2019-02-250-0/+0
|\
| * Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\
| | * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\
* | | | Add default code reviewers into OWNERS am: 0609351c74 am: 4846753e02Chih-Hung Hsieh2019-01-171-0/+4
|\| | |
| * | | Add default code reviewers into OWNERS am: 0609351c74Chih-Hung Hsieh2019-01-171-0/+4
| |\| | | | |/ | |/|
| | * Add default code reviewers into OWNERSChih-Hung Hsieh2019-01-171-0/+4
| | |\
| | | * Add default code reviewers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Chih-Hung Hsieh2019-01-171-0/+4
* | | | Revert "Merge tag 'v3.0.1-javalite'" am: 61f5732738 am: 8b458c474fColin Cross2018-11-061451-626560/+0
|\| | |
| * | | Revert "Merge tag 'v3.0.1-javalite'" am: 61f5732738Colin Cross2018-11-061451-626560/+0
| |\| |
| | * | Revert "Merge tag 'v3.0.1-javalite'"Colin Cross2018-11-061451-626560/+0
| | |\|
| | | * Revert "Merge tag 'v3.0.1-javalite'"android-wear-8.0.0_r2Colin Cross2018-11-041451-626560/+0
* | | | Revert "Add Android files" am: da247c697d am: ff2d9dbaa8Colin Cross2018-11-064-473/+0
|\| | |
| * | | Revert "Add Android files" am: da247c697dColin Cross2018-11-064-473/+0
| |\| |
| | * | Revert "Add Android files"Colin Cross2018-11-064-473/+0
| | |\|
| | | * Revert "Add Android files"Colin Cross2018-11-044-473/+0
* | | | Revert "Remove unused reference to missing sun.misc.Unsafe method" am: d6c856...Colin Cross2018-11-061-13/+4
|\| | |
| * | | Revert "Remove unused reference to missing sun.misc.Unsafe method" am: d6c856...Colin Cross2018-11-061-13/+4
| |\| |
| | * | Revert "Remove unused reference to missing sun.misc.Unsafe method"Colin Cross2018-11-061-13/+4
| | |\|
| | | * Revert "Remove unused reference to missing sun.misc.Unsafe method"Colin Cross2018-11-041-13/+4
* | | | Remove unused reference to missing sun.misc.Unsafe method am: 7664db57a5 am: ...Colin Cross2018-11-041-4/+13
|\| | |
| * | | Remove unused reference to missing sun.misc.Unsafe method am: 7664db57a5Colin Cross2018-11-041-4/+13
| |\| |
| | * | Remove unused reference to missing sun.misc.Unsafe methodColin Cross2018-11-041-4/+13
| | |\|
| | | * Remove unused reference to missing sun.misc.Unsafe methodColin Cross2018-11-011-4/+13
* | | | Add Android files am: 2942be007a am: 560791a7acColin Cross2018-11-044-0/+473
|\| | |
| * | | Add Android files am: 2942be007aColin Cross2018-11-044-0/+473
| |\| |
| | * | Add Android filesColin Cross2018-11-044-0/+473
| | |\|
| | | * Add Android filesColin Cross2018-11-014-0/+473
* | | | Merge tag 'v3.0.1-javalite' am: f4fe6ab672 am: de855a84c0Colin Cross2018-11-041451-0/+626560
|\| | |
| * | | Merge tag 'v3.0.1-javalite' am: f4fe6ab672Colin Cross2018-11-041451-0/+626560
|/| | | | |/ /
| * / Merge tag 'v3.0.1-javalite'Colin Cross2018-11-041451-0/+626560
|/| | | |/
| * Merge tag 'v3.0.1-javalite'Colin Cross2018-10-251451-0/+626560
|/|
| * Merge pull request #1877 from pherl/javaliteJisi Liu2016-07-291-0/+1
| |\
| | * Bump lite version 3.0.1Jisi Liu2016-07-281-0/+1
| * | Merge pull request #1876 from pherl/javaliteJisi Liu2016-07-286-16/+42
| |\|
| | * Include javadoc/source in Java release packages.Feng Xiao2016-07-286-16/+42
| |/
| * Merge pull request #1873 from pherl/javaliteJisi Liu2016-07-283-3/+5
| |\
| | * Update maven to call the plugin to generate javalite code.Jisi Liu2016-07-282-1/+3
| | * update javalite versions.Jisi Liu2016-07-282-2/+2
| |/
| * Merge pull request #1872 from pherl/fixwin-javaliteJisi Liu2016-07-281-5/+3
| |\
| | * Fix build protoc script for windowsJisi Liu2016-07-281-5/+3
| |/
| * Merge pull request #1856 from pherl/javaliteJisi Liu2016-07-263-4/+149
| |\
| | * Change documentation for javalite releaseJisi Liu2016-07-261-4/+13
| | * Move the protoc pom to protoc-pom.xml in the lite.Jisi Liu2016-07-261-0/+0
| | * Add a pom for javalite pluginJisi Liu2016-07-262-0/+136
| * | Merge pull request #1854 from pherl/javaliteJisi Liu2016-07-262-8/+22
| |\|
| | * fix comments.Jisi Liu2016-07-261-1/+1
| | * Fix the script comments.Jisi Liu2016-07-261-2/+2
| | * Make protoc-artifacts able to build plugin.Jisi Liu2016-07-262-8/+22
| |/
| * Merge pull request #1840 from pherl/javaliteJisi Liu2016-07-251-0/+1
| |\
| | * Add lite plugin output to gitignoreJisi Liu2016-07-251-0/+1