summaryrefslogtreecommitdiff
path: root/JavaLibrary.bp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-09 21:12:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-09 21:12:20 +0000
commit80489e72ce9157ec31713f1df02498566a09e68b (patch)
tree840924da66a82b6a7dbeb66fe6a58f37a9f9b64f /JavaLibrary.bp
parentc06d07791e8df7e042366648b02b145078395480 (diff)
parent5b3d1347695551d2e571694efca0889b9676cdee (diff)
Merge "[automerger skipped] Merge changes from topic "am-15cb99cc4d4c429085be893ac571ecd0" into oreo-mr1-cts-dev am: 9ba7ea0b4c -s ours" into pie-cts-dev am: 5b3d134769 -s ours
am skip reason: Change-Id If6a2dbb615a70739350cbae91cc33754afe2b793 with SHA-1 eb86fbe185 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1311474 Change-Id: Ie319de1fa413bada792fef382ee7c6e958ae05b4
Diffstat (limited to 'JavaLibrary.bp')
0 files changed, 0 insertions, 0 deletions