tree 1db69e8c93812d4423b7039a0befc58a783b3b6b
parent 7226245928931ed30dde227d50bd2f8f0ba9af40
parent cc41430a8bd45d6f33fcecef44fe3461803e2ffe
author Anton Hansson <hansson@google.com> 1548889697 -0800
committer android-build-merger <android-build-merger@google.com> 1548889697 -0800

Merge "Fix RRO when LOCAL_EXPORT_PACKAGE_RESOURCES is unset" am: bb83cc2689 am: 65adcb9e7f
am: cc41430a8b

Change-Id: I6d97ea941b1e4cd3a38df749c725dee2a0e3bd13