diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2019-01-09 01:37:42 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-09 01:37:42 -0800 |
| commit | 9a424bf3d7d9f5b2cd716e8746795ca962d5e4c3 (patch) | |
| tree | c36714f1762d406001a24d8479a05116ab2d2ab7 /test/MultiDex | |
| parent | 63fdd50350ba0c6515d3156c673e0ed41b517ad5 (diff) | |
| parent | 1879acd9e64adcf214e850f0c0a67e8519d1492b (diff) | |
Merge "Revert "Move conscrypt back to core image to unblock Golem."" am: 458a948d4f
am: 1879acd9e6
Change-Id: I7709319dda2ed54572c853cc47f8f569bd493e1f
Diffstat (limited to 'test/MultiDex')
0 files changed, 0 insertions, 0 deletions