tree ed73fc1975c6705d70f0c79a41a45adfddcd4a6b
parent d16ff83ec8ff64f92ec9aa3c0e1b84a423a4bb0a
parent 9033ba7bcdb1ba290c9af8fbfa71b10cfc0079cc
author Kiyoung Kim <kiyoungkim@google.com> 1571300398 -0700
committer android-build-merger <android-build-merger@google.com> 1571300398 -0700

Merge "Support legacy and vndklite mode" am: 5cdad7a708
am: 9033ba7bcd

Change-Id: Iccf408c893ad2ff97a861fd994364b14e2080ba6