diff options
| author | Narayan Kamath <narayan@google.com> | 2015-12-24 04:12:00 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-24 04:12:00 -0800 |
| commit | 47b78b5654f845a9dc7e7cafff92a4508e87b1ac (patch) | |
| tree | f6e5645291977181afd6f9b9ba9a947fe8b89f30 | |
| parent | 5b46d7d4a6f9bee2e6105ed9e666f416bedcb347 (diff) | |
| parent | beb9a51c4d6d935d540b5f69bda7acfb3d6f8812 (diff) | |
| download | okhttp-47b78b5654f845a9dc7e7cafff92a4508e87b1ac.tar.gz | |
Merge changes from topic \'aosp-merge-24-12\' am: 27a7c9ada5
am: beb9a51c4d
* commit 'beb9a51c4d6d935d540b5f69bda7acfb3d6f8812':
Use core-oj alongside core-libart wherever required.
Add core-oj to the list of dependencies
0 files changed, 0 insertions, 0 deletions