summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Snap for 7817384 from 0b55aed83b049e2270dbde35dfa5e850c08cfaeb to simp...simpleperf-releaseAndroid Build Coastguard Worker2021-10-121-1/+1
|\
| * Snap for 7817384 from 0b55aed83b049e2270dbde35dfa5e850c08cfaeb to simpleperf-...Android Build Coastguard Worker2021-10-121-1/+1
|/|
| * Merge "Merge Android 12"HEADmasterXin Li2021-10-071-1/+1
| |\
| | * Merge Android 12Xin Li2021-10-061-1/+1
| |/|
| | * Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-141-1/+1
| | |\
| | | * Merge "Fix Colors crashing on rotation" am: e6bb5cbc7c am: 0388b59400Galia Peycheva2021-08-021-8/+8
| | | |\ | | | |/ | | |/|
| | * | Merge "Fix Colors crashing on rotation" am: e6bb5cbc7cGalia Peycheva2021-08-021-8/+8
| | |\ \ | | |/ / | |/| |
| | | * [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0...Treehugger Robot2021-07-040-0/+0
| | | |\ | | | |/ | | |/|
| | * | [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0...Treehugger Robot2021-07-040-0/+0
| | |\ \
| | | | * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee3502ce5...Bill Yi2021-07-040-0/+0
| | | | |\ | | | |_|/ | | |/| |
| | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-041-1/+1
| | | | * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d9fd27df...Bill Yi2021-06-010-0/+0
| | | | |\
| | | | | * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d9fd27df...android12-devBill Yi2021-06-010-0/+0
| | | | | |\
| | | | | | * Import translations. DO NOT MERGE ANYWHEREBill Yi2021-05-311-1/+1
| | | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 434901289...Bill Yi2021-06-010-0/+0
| | | | |\| |
| | | | | * | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 434901289...Bill Yi2021-06-010-0/+0
| | | | | |\ \
| | | | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-05-311-1/+1
| | | | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b1326e86c...Bill Yi2021-06-010-0/+0
| | | | |\| | |
| | | | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-05-311-1/+1
| | | | |/ / /
| | | | * | | [automerger skipped] Mark ab/7061308 as merged in stage. am: e00bb426e9 -s ou...Xin Li2021-02-210-0/+0
| | | | |\ \ \
| | | | | * \ \ [automerger skipped] Mark ab/7061308 as merged in stage. am: e00bb426e9 -s oursXin Li2021-02-200-0/+0
| | | | | |\ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | | * | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/screensavers/Basic" am: 8bf9...Bob Badour2021-02-211-0/+4
| | | | |\| | |
| | | | | * | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/screensavers/Basic" am: 8bf9...Bob Badour2021-02-191-0/+4
| | | | | |\ \ \
| | | | * | | | | Mark ab/6881855 as merged am: 3bf7994765 am: 17fa819502Xin Li2020-11-230-0/+0
| | | | |\| | | |
| | | | * | | | | Revert "Import translations. DO NOT MERGE ANYWHERE"Bill Yi2020-11-2085-0/+1785
| | | | * | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2020-11-1985-1785/+0
| | | | * | | | | [automerger skipped] Skip ab/6749736 in stage. am: 7301a767ea -s ours am: 0c2...Xin Li2020-10-090-0/+0
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ [automerger skipped] Merge "Merge Android R" am: a3e1235f8a -s ours am: bb084...Xin Li2020-09-110-0/+0
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-020-0/+0
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Remove setting low profile in Basic dreams am: 84729730e1 am: 68edd5da1b am: ...Galia Peycheva2020-04-160-0/+0
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Remove setting low profile in Basic dreams am: 84729730e1 am: 22e7671207 am: ...Galia Peycheva2020-04-160-0/+0
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Remove setting low profile in Basic dreams am: 84729730e1 am: 68edd5da1b am: ...Galia Peycheva2020-04-162-2/+1
| | | | |\ \ \ \ \ \ \ \ \ \
* | | | | \ \ \ \ \ \ \ \ \ \ Merge "Snap for 7649897 from e6bb5cbc7c9a34304836fc423c8e1c8ccd8c400c to simp...Android Build Coastguard Worker2021-08-171-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Snap for 7649897 from e6bb5cbc7c9a34304836fc423c8e1c8ccd8c400c to simpleperf-...Android Build Coastguard Worker2021-08-171-8/+8
|/| | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Fix Colors crashing on rotation"android-s-beta-5android-s-beta-5Galia Peycheva2021-08-021-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Fix Colors crashing on rotationGalia Peycheva2021-08-021-8/+8
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "Snap for 7549644 from 0a878cabbe8464c89fdb5654b6afd90ce1c661ff to simp...Android Build Coastguard Worker2021-07-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Snap for 7549644 from 0a878cabbe8464c89fdb5654b6afd90ce1c661ff to simpleperf-...Android Build Coastguard Worker2021-07-141-1/+1
|/| | | | | | | | | | | | | | | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE ANYWHERE"android-s-beta-4android-s-beta-3android-s-beta-4Treehugger Robot2021-07-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-031-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Snap for 7209783 from e00bb426e924a5f6ea508078728ea7e21ebcb677 to simp...android-build-prod (mdb)2021-03-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Snap for 7209783 from e00bb426e924a5f6ea508078728ea7e21ebcb677 to simpleperf-...android-build-prod (mdb)2021-03-150-0/+0
|/| | | | | | | | | | | | | | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li2021-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | / / / | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| | * | | | | | | | | | Mark ab/6881855 as merged am: 3bf7994765Xin Li2020-11-230-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | [automerger skipped] Skip ab/6749736 in stage. am: 7301a767ea -s ours am: 0c2...Xin Li2020-10-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | | * | | | | | | | | [automerger skipped] Skip ab/6749736 in stage. am: 7301a767ea -s oursXin Li2020-10-090-0/+0
| | | |\ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/screensavers/Basic" am: 8bf9...Bob Badour2021-02-191-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Snap for 7168215 from 8bf9bcab58fbdfd3e31e6652699103eec8779214 to simp...android-build-prod (mdb)2021-02-241-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Snap for 7168215 from 8bf9bcab58fbdfd3e31e6652699103eec8779214 to simpleperf-...android-build-prod (mdb)2021-02-241-0/+4
|/| | | | | | | | | | | | | | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/screensavers/Basic"Bob Badour2021-02-191-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |