summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedHEADmasterXin Li2020-08-270-0/+0
|\
| * Merge "Enable dx in unbundled builds." am: d236cfb4cf am: 1da484487fMartin Stjernholm2020-06-111-3/+0
| |\
| * \ Merge "Remove MODULE_LICENSE_APACHE2 from dalvik" am: d6b330660f am: ef4eafdbbfTreehugger Robot2020-04-281-0/+0
| |\ \
| * \ \ Merge "Update bat files to not use find_java.bat" am: 6bf23b020c am: c7710e69f6Joe Baker-Malone2020-04-282-11/+55
| |\ \ \
| * \ \ \ [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...android-mainline-11.0.0_r1android11-mainline-releaseandroid11-devXin Li2019-10-300-0/+0
| |\ \ \ \
| * \ \ \ \ Merge "Remove commment about java.nio.charset.ModifiedUtf8" am: 95783d06dd am...vichang2019-10-251-2/+0
| |\ \ \ \ \
| * \ \ \ \ \ [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge "Bumped DEX format version to 040." am: ba6932af4c am: 98318494cb am: 7...Ulyana Trafimovich2019-08-302-1/+11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge "Optimize dexdeps code." am: a9e6e81858 am: a937690b71 am: c4b90edac1Jaewoong Jung2019-07-151-68/+72
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge "Remove dalvik/libdex" am: 8843541a21 am: 09d4dccf05David Sehr2019-04-0435-10948/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge "Add sehr, mathieuc to dalvik/OWNERS" am: 6bc54f7aed am: 545b8cd8d5David Sehr2019-04-041-3/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge "Remove dalvik/dexdump tool" am: 669c968521 am: 1a031eef31David Sehr2019-04-046-2533/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge master@5433138 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge master@5433138 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-032-8/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Remove `create_stubs: false` from droiddoc" am: f9ab924fb7Treehugger Robot2020-08-032-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove `create_stubs: false` from droiddoc"Treehugger Robot2020-08-032-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Remove `create_stubs: false` from droiddocLiz Kammer2020-07-312-2/+0
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "Update OWNERS list" am: e7d81cd936Orion Hodson2020-07-301-1/+1
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Update OWNERS list"Orion Hodson2020-07-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Update OWNERS listOrion Hodson2020-07-291-1/+1
* | | | | | | | | | | | | | | | Merge "Inclusive language updates" am: c634c04b70Treehugger Robot2020-07-294-4/+4
|\| | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Inclusive language updates"Treehugger Robot2020-07-294-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Inclusive language updatesOrion Hodson2020-07-294-4/+4
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | / Merge "Enable dx in unbundled builds." am: d236cfb4cfMartin Stjernholm2020-06-111-3/+0
|\| | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Enable dx in unbundled builds."android-r-beta-3android-r-beta-2Martin Stjernholm2020-06-111-3/+0
|/| | | | | | | | | | | |
| * | | | | | | | | | | | Enable dx in unbundled builds.Martin Stjernholm2020-06-041-3/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge "Remove MODULE_LICENSE_APACHE2 from dalvik" am: d6b330660fTreehugger Robot2020-04-281-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Merge "Remove MODULE_LICENSE_APACHE2 from dalvik"Treehugger Robot2020-04-281-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Remove MODULE_LICENSE_APACHE2 from dalvikBob Badour2020-04-271-0/+0
| |/ / / / / / / / / / /
* | | | | | | | | | | / Merge "Update bat files to not use find_java.bat" am: 6bf23b020cJoe Baker-Malone2020-04-282-11/+55
|\| | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Merge "Update bat files to not use find_java.bat"Joe Baker-Malone2020-04-282-11/+55
|/| | | | | | | | | |
| * | | | | | | | | | Update bat files to not use find_java.batJoe Baker-Malone2020-04-242-11/+55
|/ / / / / / / / / /
* | | | | | | | | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-4android-r-preview-3android-r-preview-2Xin Li2019-10-300-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-1Xin Li2019-10-300-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
* | | | | | | | | | Merge "Remove commment about java.nio.charset.ModifiedUtf8" am: 95783d06dd am...vichang2019-10-251-2/+0
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge "Remove commment about java.nio.charset.ModifiedUtf8" am: 95783d06ddvichang2019-10-251-2/+0
| |\| | | | | | | |
| | * | | | | | | | Merge "Remove commment about java.nio.charset.ModifiedUtf8"vichang2019-10-251-2/+0
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Merge "Remove commment about java.nio.charset.ModifiedUtf8"vichang2019-10-251-2/+0
| | |/| | | | | | | |
| | | * | | | | | | | Remove commment about java.nio.charset.ModifiedUtf8Victor Chang2019-10-241-2/+0
* | | | | | | | | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
|\| | | | | | | | | | | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| |\| | | | | | | |
| | * | | | | | | | Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li2019-09-080-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | / | | | | |_|_|_|_|/ | | | |/| | | | |
* | | / | | | | | Merge "Bumped DEX format version to 040." am: ba6932af4c am: 98318494cb am: 7...Ulyana Trafimovich2019-08-302-1/+11
|\| | | | | | | | | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Merge "Bumped DEX format version to 040." am: ba6932af4c am: 98318494cbUlyana Trafimovich2019-08-302-1/+11
|/| | | | | | |
| * | | | | | | Merge "Bumped DEX format version to 040." am: ba6932af4cUlyana Trafimovich2019-08-302-1/+11
| |\| | | | | |
| | * | | | | | Merge "Bumped DEX format version to 040."ndk-sysroot-r21Ulyana Trafimovich2019-08-302-1/+11
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "Bumped DEX format version to 040."Ulyana Trafimovich2019-08-302-1/+11
| | | |\ \ \ \ \ \
| | | | * | | | | | Bumped DEX format version to 040.Ulya Trafimovich2019-08-292-1/+11
| | | |/ / / / / /
* | | | | | | | / Merge "Optimize dexdeps code." am: a9e6e81858 am: a937690b71Jaewoong Jung2019-07-151-68/+72
|\| | | | | | | | | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Merge "Optimize dexdeps code." am: a9e6e81858Jaewoong Jung2019-07-151-68/+72
|/| | | | | | | | |/ / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 06:50:30 +0000