Age | Commit message (Collapse) | Author |
|
Bug: 180401296
Merged-In: Iec1673a5d3b9cf750b75cf0c3cee86c38ecbb546
Change-Id: I4bd32fba1677f6b150c3930772c3546272868d74
|
|
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1588866
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I10c766fe80ee5cf519454496c0b73622d4a50c81
|
|
|
|
Added SPDX-license-identifier-EPL to:
Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: I9cd43f586feb5cd5906cd6b649dd5f020836136c
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13110683
Change-Id: Iec1673a5d3b9cf750b75cf0c3cee86c38ecbb546
|
|
Bug: 172690556
Change-Id: Ie071e74b49de9ad7e24916f217a48fd00d4bd280
|
|
8535401e0e -s ours
am skip reason: Change-Id I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d with SHA-1 68c5822c91 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12796462
Change-Id: I7f1c86de3c610b71ed726d5611b8d361cfd5be8a
|
|
am skip reason: Change-Id I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d with SHA-1 68c5822c91 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12796462
Change-Id: Ia7bc88b0936ff6943321c2df117cb3e586d86622
|
|
Merged-In: I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d
Change-Id: Icd25eae932b0da95ff4d92328e4c457945decbc9
|
|
b592c33440 -s ours am: 3c864506c3 -s ours am: 1a7c6dde68 -s ours
am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333
Change-Id: I755d2217483642cace074a0a03cf588912a6ba3e
|
|
b592c33440 -s ours am: 3c864506c3 -s ours
am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333
Change-Id: Iba304cdd5c175d26a49245f3a7282079cfa3abbd
|
|
b592c33440 -s ours
am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333
Change-Id: Id57267bde02299dae7d802551237f3382bc2bf26
|
|
am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333
Change-Id: If01b5b0bc49f5d578648f4bc5935981b364e8a10
|
|
|
|
Bug: 168057903
Merged-In: I0e3537670da38a92f5a3a82290db17fc0570cb5a
Change-Id: I3a4960ce4279bf5722ef787f98a2762b976645b5
|
|
(rvc-dev-plus-aosp-without-vendor@6692709) am: 2cf517dad5 -s ours am: 273aed17d3 -s ours am: 8afee8df59 -s ours
am skip reason: Change-Id I38fc37dadb4e0f3f4540c18e48660456768d0c3e with SHA-1 b50af440ad is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12469998
Change-Id: I1fab34e69e96aab4cbc37f5767af2ec7320453d9
|
|
(rvc-dev-plus-aosp-without-vendor@6692709) am: 2cf517dad5 -s ours am: 273aed17d3 -s ours
am skip reason: Change-Id I38fc37dadb4e0f3f4540c18e48660456768d0c3e with SHA-1 b50af440ad is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12469998
Change-Id: I1e2b63146ae67e8c68ee0223ca3772362d0458aa
|
|
(rvc-dev-plus-aosp-without-vendor@6692709) am: 2cf517dad5 -s ours
am skip reason: Change-Id I38fc37dadb4e0f3f4540c18e48660456768d0c3e with SHA-1 b50af440ad is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12469998
Change-Id: I2ea99a0044fc81ef241ba6611b2042792dafed97
|
|
Bug: 166295507
Merged-In: I38fc37dadb4e0f3f4540c18e48660456768d0c3e
Change-Id: I0e3537670da38a92f5a3a82290db17fc0570cb5a
|
|
am: 6fac8fec6c am: b50af440ad am: 68c5822c91
Change-Id: I99a6f46afe89dc1ad88636e758547e5483fdf64f
|
|
am: 6fac8fec6c am: b50af440ad
Change-Id: I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d
|
|
am: 6fac8fec6c
Change-Id: I38fc37dadb4e0f3f4540c18e48660456768d0c3e
|
|
Change-Id: I5accc5971cd729e7a6f27a2dfb85d93e7c596bcb
|
|
|
|
Bug: 68860345
Bug: 69058154
Bug: 151953481
Test: no code changes
Change-Id: I8b820dc41c74231bc99f57617af50840ce20d63f
|
|
stag-aosp-master am: 23eb5b6109 -s ours am: d74f6bfccb am: 26adab2269
Change-Id: I3bca2b6ba8753a37deba0df0e39237ca999e7a1b
|
|
stag-aosp-master am: 23eb5b6109 -s ours am: d74f6bfccb
Change-Id: Ic7a2fb8c1692fdc2fa748face2f21a8b23d8e73d
|
|
stag-aosp-master am: 23eb5b6109 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic89d6984dd051927f17bebffb858143c319d340f
|
|
Bug: 151763422
Change-Id: I1a0a4b4fc29b07b50e3d89aba64383e314f39b0f
|
|
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 49f40ab7c8 -s ours am: 1e1be6dfb4 am: e8a12cf792
Change-Id: I7ba85d4b4f120272d839f6ebf29228d24e131929
|
|
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 49f40ab7c8 -s ours am: 1e1be6dfb4
Change-Id: I1077b7ca5d6cffe52e5992d1faa32d4fb6a659bf
|
|
stag-aosp-master am: 49f40ab7c8
Change-Id: Ia08140c3362320a57fd3608147109dda3c26247d
|
|
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 49f40ab7c8 -s ours
am skip reason: subject contains skip directive
Change-Id: I44a60b3eb3b26a3c3f7f15da48186a82c918b36f
|
|
Bug: 151763422
Change-Id: I30168a0db73a6ab4edb9f271ee0e912ab892674f
|
|
am: e8fb6fdb11
Change-Id: Id99df4ea5983c820b06bc977a725282994b74312
|
|
Change-Id: I8873012c65dde9a4e95b3700473841928410adb8
|
|
Change-Id: Ie0603bfb9c07642857f731907a073a1dc4f8fb2a
|
|
Change-Id: I1736daf588c93b60d065aa936a0a7616ef620721
|
|
Change-Id: I96d92457de3ad0fc0f6a389c5106e7d27350d5db
|
|
|
|
Test: m nothing
Change-Id: I4114606985b6da7b5fdc9d910c7f38d637c0b8f3
|
|
These jars are loaded by an OpenJDK 8 runtime from
prebuilts/studio/jdk in frameworks/layoutlib/bridge/tests/run_tests.sh
so the upcoming change of the platform default to Java language level
9 will break those tests.
This change can be reverted if/when prebuilts/studio/jdk is upgraded
to OpenJDK 9+.
Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make layoutlib layoutlib-tests sdk libandroid_runtime
Test: frameworks/layoutlib/bridge/tests/run_tests.sh out/layoutlib-failures
Bug: 141970724
Change-Id: Iea6002318a446782d1cec38906ead4c247dab00c
|
|
am: 23d64d603c -s ours
am skip reason: subject contains skip directive
Change-Id: If3f3c971fe7a5365479a9f73043d474f23cf6ba9
|
|
Bug: 120848293
Change-Id: I53f248679f38594622cb055a7a85c3f17f06c246
|
|
MERGE am: c1ef605003 -s ours am: 621f17ced7 -s ours
am: d580604d38 -s ours
Change-Id: Id429a81bdfaa3990a6ec0268369d9b0e58844d1d
|
|
MERGE am: c1ef605003 -s ours
am: 621f17ced7 -s ours
Change-Id: I6eac450a4b4d38d22dc137fdcd0d79bc621ee9ff
|
|
am: c1ef605003 -s ours
Change-Id: I5b855d3194c4227d3128aa69b0bbc8c9b7409c54
|
|
Change-Id: Iee4435844038a2441dac626e3be73e714899174b
|
|
MERGE am: 245b5d788b -s ours
am: 98af04ef43 -s ours
Change-Id: I9934dffb30d736eaa8669b957cb39621de79d449
|
|
MERGE
am: 245b5d788b -s ours
Change-Id: I46c0b565001101ab63e518511b0fa9959e462086
|