tree 66eec793c371e07d6da713c5f34539645a69b027
parent fc0fbbb3af201499c5df7e8d7b813f336bdc2078
parent 453a487b29f62efe54734d1ebdaaacf307ac675b
author Kiyoung Kim <kiyoungkim@google.com> 1552382861 -0700
committer android-build-merger <android-build-merger@google.com> 1552382861 -0700

[automerger skipped] Merge "Add product apk support from libnativeloader" am: 307df45b5f am: ad0ca523a6
am: 453a487b29 -s ours
am skip reason: change_id Iaa8d0ea61b1b9ab8a1da676a492f75c6a5d71d5d with SHA1 cfc8da11f6 is in history

Change-Id: Ie75c4519d6b1341fbd8b0992009add4eef913d85