tree ed73fc1975c6705d70f0c79a41a45adfddcd4a6b
parent 4390bdc1851713973c7e9397872975d0c321197d
parent e3c6175e60e8fa83fbe98d0401183789d70955ae
author Kiyoung Kim <kiyoungkim@google.com> 1571300758 -0700
committer android-build-merger <android-build-merger@google.com> 1571300758 -0700

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

Change-Id: I398514945e13ac91dcabc213fd2f97c3d92286e6