| commit | 5830229f7b6da30ea89deb7e7c51ebe6573bd6d0 | [log] [tgz] |
|---|---|---|
| author | Roland Levillain <rpl@google.com> | Thu Jul 04 13:14:11 2019 +0000 |
| committer | Roland Levillain <rpl@google.com> | Fri Jan 03 18:25:24 2020 +0000 |
| tree | 6843c8648c0dda8f589f4a5fce2221c486bfcbfb | |
| parent | 999a90b8974e833cca120da46a08f519190ed3d6 [diff] | |
| parent | 1c7f3e35689b41d1ee32534b8d12e194c6a01595 [diff] |
Merge AOSP (master) `prebuilts/runtime` into Android (master).
The internal version of `prebuilts/runtime` was way behind its AOSP
counterpart, creating build failures.
Test: Run these commands:
. ./build/envsetup.sh \
&& lunch sdk-eng \
&& art/tools/buildbot-build.sh --host
on an Android (internal) master-art source tree.
Bug: 139131024
Bug: 144702219
Change-Id: I385f3a0dcd56f65cf073a5b985f5b66e13539b1e
diff --git a/adb b/adb index d5979b6..5468031 100755 --- a/adb +++ b/adb Binary files differ