summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Mark sc-dev-plus-aosp-without-vendor@7634622 as mergedHEADmasterXin Li2021-08-140-0/+0
|\
| * Merge "AOSP Music to bazel: Added BUILD file" am: 49a4572303 am: f82192d67dTreehugger Robot2021-07-211-0/+9
| |\
| * \ Merge "API level 30 upgrade: AOSP/Music" am: 4284751db0 am: ca2108beddTreehugger Robot2021-07-142-4/+4
| |\ \
| * \ \ [automerger skipped] Mark ab/7061308 as merged in stage. am: 231a577ca3 -s ou...android12-devXin Li2021-02-200-0/+0
| |\ \ \
| | * \ \ [automerger skipped] Mark ab/7061308 as merged in stage. am: 231a577ca3 -s oursXin Li2021-02-200-0/+0
| | |\ \ \
| * | | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Music" am: 1a227ef780 a...Bob Badour2021-02-202-0/+26
| |\| | | |
| | * | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Music" am: 1a227ef780 a...Bob Badour2021-02-192-0/+26
| | |\ \ \ \
| * | | | | | Mark ab/6881855 as merged am: 4e0faaeced am: 716864e6d7Xin Li2020-11-230-0/+0
| |\| | | | |
| * | | | | | [automerger skipped] Skip ab/6749736 in stage. am: a5a04bfd32 -s ours am: 86c...Xin Li2020-10-090-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li2020-08-270-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge "AOSP/Music - Update language to comply with Android's inclusive langua...Treehugger Robot2020-07-302-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge "AOSP/Music - Add Kotlin version of Music Java code" am: 6c7680dfb5 am:...Treehugger Robot2020-05-20418-23/+769
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge "AOSP/Music - Update sdkVersion to 29" am: 7fdd78ee3b am: 84c84ae35d am...Treehugger Robot2020-05-111-2/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge "Remove MODULE_LICENSE_APACHE2 from apps/Music" am: 20dfa269dd am: 9229...Treehugger Robot2020-04-281-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Revert "AOSP/Music - Updated to sdkVersion 29."" am: 332a1b40f8 am: 1a...Treehugger Robot2020-03-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Declare resources in a library under kotlin/ for Music app Bazel build...Treehugger Robot2021-08-132-1/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Declare resources in a library under kotlin/ for Music app Bazel build."android-s-beta-5android-s-beta-5Treehugger Robot2021-08-132-1/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Declare resources in a library under kotlin/ for Music app Bazel build.Romain Jobredeaux2021-08-122-1/+32
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | / Merge "AOSP Music to bazel: Added BUILD file" am: 49a4572303Treehugger Robot2021-07-211-0/+9
|\| | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "AOSP Music to bazel: Added BUILD file"Treehugger Robot2021-07-211-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | AOSP Music to bazel: Added BUILD fileDamian Patel2021-07-211-0/+9
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | / Merge "API level 30 upgrade: AOSP/Music" am: 4284751db0Treehugger Robot2021-07-142-4/+4
|\| | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "API level 30 upgrade: AOSP/Music"Treehugger Robot2021-07-142-4/+4
|/| | | | | | | | | | | |
| * | | | | | | | | | | | API level 30 upgrade: AOSP/MusicDamian Patel2021-07-142-4/+4
|/ / / / / / / / / / / /
* | | | | | | | | | | | Mark ab/7061308 as merged in stage.android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Xin Li2021-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Mark ab/6881855 as merged am: 4e0faaecedXin Li2020-11-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | [automerger skipped] Skip ab/6749736 in stage. am: a5a04bfd32 -s ours am: 86c...Xin Li2020-10-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | [automerger skipped] Skip ab/6749736 in stage. am: a5a04bfd32 -s oursXin Li2020-10-090-0/+0
| | |\ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Music" am: 1a227ef780Bob Badour2021-02-192-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Music"Bob Badour2021-02-182-0/+26
|/| | | | | | | | | | |
| * | | | | | | | | | | [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/MusicBob Badour2021-02-122-0/+26
|/ / / / / / / / / / /
* | | / / / / / / / / Mark ab/6881855 as mergedandroid-s-preview-1Xin Li2020-11-230-0/+0
|\| | | | | | | | | | | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li2020-08-270-0/+0
| |\| | | | | | | | | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li2020-08-270-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li2020-08-270-0/+0
| | | |\ \ \ \ \ \ \
| * | | | | | | | | | Merge "AOSP/Music - Update language to comply with Android's inclusive langua...Treehugger Robot2020-07-302-2/+2
| |\| | | | | | | | | | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge "AOSP/Music - Add Kotlin version of Music Java code" am: 6c7680dfb5 am:...Treehugger Robot2020-05-20418-23/+769
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge "AOSP/Music - Update sdkVersion to 29" am: 7fdd78ee3b am: 84c84ae35d am...Treehugger Robot2020-05-111-2/+3
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge "Remove MODULE_LICENSE_APACHE2 from apps/Music" am: 20dfa269dd am: 9229...Treehugger Robot2020-04-281-0/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge "Revert "AOSP/Music - Updated to sdkVersion 29."" am: 332a1b40f8 am: 1a...Treehugger Robot2020-03-181-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Merge "AOSP/Music - Update language to comply with Android's inclusive langua...Treehugger Robot2020-07-302-2/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge "AOSP/Music - Update language to comply with Android's inclusive langua...Treehugger Robot2020-07-302-2/+2
| | |\ \ \ \ \ \
| * | | | | | | | Merge "AOSP/Music - Add Kotlin version of Music Java code" am: 6c7680dfb5 am:...Treehugger Robot2020-05-20418-23/+769
| |\| | | | | | | | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge "AOSP/Music - Update sdkVersion to 29" am: 7fdd78ee3b am: 84c84ae35d am...Treehugger Robot2020-05-111-2/+3
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge "Remove MODULE_LICENSE_APACHE2 from apps/Music" am: 20dfa269dd am: 9229...Treehugger Robot2020-04-281-0/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge "Revert "AOSP/Music - Updated to sdkVersion 29."" am: 332a1b40f8 am: 1a...Treehugger Robot2020-03-181-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |