aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add balsini@ to the OWNERS file am: 205092a90fHEADandroid-s-beta-5android-s-beta-4android-s-beta-3masterandroid-s-beta-5android-s-beta-4Alessio Balsini2021-05-131-0/+1
|\
| * Add balsini@ to the OWNERS fileandroid-s-beta-2android-s-beta-1Alessio Balsini2021-05-131-0/+1
|/
* Mark ab/7061308 as merged in stage.Xin Li2021-02-200-0/+0
|\
| * Mark ab/6881855 as merged am: f3cc7683dcXin Li2020-11-240-0/+0
| |\
| * \ Set min_sdk_version to 30 am: 0422900e0a am: 988d1dfe02 am: 5df62a5869Nikita Ioffe2020-10-281-0/+1
| |\ \
| | * \ Set min_sdk_version to 30 am: 0422900e0a am: 988d1dfe02Nikita Ioffe2020-10-281-0/+1
| | |\ \
| * | | | [automerger skipped] Skip ab/6749736 in stage. am: eb7b54189e -s ours am: e1d...Xin Li2020-10-090-0/+0
| |\| | |
| | * | | [automerger skipped] Skip ab/6749736 in stage. am: eb7b54189e -s oursXin Li2020-10-090-0/+0
| | |\ \ \
* | | \ \ \ [LSC] Add LOCAL_LICENSE_KINDS to external/libfuse am: 5e4d0a1ef9Bob Badour2021-02-161-0/+41
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | [LSC] Add LOCAL_LICENSE_KINDS to external/libfuseBob Badour2021-02-121-0/+41
|/ / / / /
* | | | / Mark ab/6881855 as mergedXin Li2020-11-230-0/+0
|\| | | | | |_|_|/ |/| | |
| * | | [automerger skipped] Merge Android R am: f8c3b42c8c -s ours am: 739c85f2a1 -s...Xin Li2020-09-110-0/+0
| |\| |
| | * | [automerger skipped] Merge Android R am: f8c3b42c8c -s ours am: 739c85f2a1 -s...Xin Li2020-09-110-0/+0
| | |\ \
| | | * \ [automerger skipped] Merge Android R am: f8c3b42c8c -s ours am: 739c85f2a1 -s...Xin Li2020-09-110-0/+0
| | | |\ \
| * | | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| |\| | | |
| | * | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| | |\| | |
| | | * | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| | | |\ \ \
| * | | | | | [automerger skipped] Merge "libfuse: Mark vendor_available am: b9ab0b743e am:...Automerger Merge Worker2020-06-020-0/+0
| |\| | | | |
| * | | | | | Merge "libfuse: Mark vendor_available am: b9ab0b743e am: f0dcdfe56f am: dfbcb...Automerger Merge Worker2020-06-020-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ libfuse: Mark vendor_available am: b9ab0b743e am: f0dcdfe56f am: dfbcbb8fa1Woody Lin2020-06-021-0/+2
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ libfuse: Mark vendor_available am: b9ab0b743e am: f0dcdfe56fandroid-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseWoody Lin2020-06-021-0/+2
| | | |\ \ \ \ \ \
| * | | \ \ \ \ \ \ libfuse: Mark vendor_available am: b9ab0b743e am: f0dcdfe56f am: 42c95604b5Woody Lin2020-06-021-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix FUSE_CANONICAL_PATH response am: 3a69a04fa6 am: edd737edd7 am: 47a3bf1fa2...Zim2020-03-270-0/+0
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Fix FUSE_CANONICAL_PATH response am: 3a69a04fa6 am: edd737edd7 am: 47a3bf1fa2Zim2020-03-271-1/+3
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Fix FUSE_CANONICAL_PATH response am: 3a69a04fa6 am: edd737edd7Zim2020-03-271-1/+3
| | |/| | | | | | | |
| * | | | | | | | | | Fix FUSE_CANONICAL_PATH response am: 3a69a04fa6 am: 567d29cb1d am: de14317a48Zim2020-03-270-0/+0
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Fix FUSE_CANONICAL_PATH response am: 3a69a04fa6 am: edd737edd7 am: 4c6b61db27Zim2020-03-271-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Set min_sdk_version to 30 am: 0422900e0aNikita Ioffe2020-10-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Set min_sdk_version to 30Nikita Ioffe2020-10-281-0/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Merge "libfuse: Mark vendor_available am: b9ab0b743e am: 5a495c6e47" into rvc...Automerger Merge Worker2020-06-020-0/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | libfuse: Mark vendor_available am: b9ab0b743e am: 5a495c6e47Woody Lin2020-06-021-0/+2
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | / / | | | | |_|_|_|/ / | | | |/| | | | |
| * | | | | | | | libfuse: Mark vendor_available am: b9ab0b743e am: f0dcdfe56fWoody Lin2020-06-021-0/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | / / | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | libfuse: Mark vendor_available am: b9ab0b743eandroid-11.0.0_r16android11-d1-b-releaseWoody Lin2020-06-021-0/+2
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Fix FUSE_CANONICAL_PATH response am: 3a69a04fa6 am: 567d29cb1dZim2020-03-270-0/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Fix FUSE_CANONICAL_PATH response am: 3a69a04fa6 am: edd737edd7Zim2020-03-271-1/+3
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | / / | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fix FUSE_CANONICAL_PATH response am: 3a69a04fa6Zim2020-03-271-1/+3
| |/| | | | |
* | | | | | | [automerger skipped] Merge Android R am: f8c3b42c8c -s oursXin Li2020-09-110-0/+0
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge Android RXin Li2020-09-087-3/+163
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-277-3/+163
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | libfuse: Mark vendor_available am: b9ab0b743eWoody Lin2020-06-021-0/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| | * | | libfuse: Mark vendor_availableandroid11-devWoody Lin2020-06-011-0/+2
| | | |/ | | |/|
| * | | Fix FUSE_CANONICAL_PATH response am: 3a69a04fa6Zim2020-03-271-1/+3
| |\| | | | |/ | |/|
| | * Fix FUSE_CANONICAL_PATH responseZim2020-03-251-1/+3
| |/
| * Merge "Support FUSE_CANONICAL_PATH in libfuse"TreeHugger Robot2020-01-135-0/+156
| |\
| | * Support FUSE_CANONICAL_PATH in libfuseZim2020-01-105-0/+156
| * | We should be showing raw LGPL license text.Jeff Sharkey2019-12-201-1/+1
| |/
| * Merge tag 'fuse-3.8.0' into HEAD am: 898c253bc0 am: 54ee84ad31Haibo Huang2019-11-133-4/+4
| |\ | |/ |/|
* | Merge tag 'fuse-3.8.0' into HEAD am: 898c253bc0Haibo Huang2019-11-1324-184/+477
|\ \
| * \ Merge tag 'fuse-3.8.0' into HEADHaibo Huang2019-11-1324-184/+477
| |\ \