Merge "core: Move core.oat bootjar definitions into envsetup.mk" am: 6cb7688e85

am: 692309c9f5  -s ours

Change-Id: I70259e9774c27532e6603a36ab474f3b939c42b1
This commit is contained in:
Igor Murashkin 2017-06-16 03:08:35 +00:00 committed by android-build-merger
commit 8748f92627

Diff content is not available