tree fe5c34664f260e1b3fd134a920b409702771f5d3
parent 495c981604afd2bc0394803d7c1a09f192e791b9
parent 65adcb9e7f779f9a6fe9d097768c9fd0f6170b32
author Anton Hansson <hansson@google.com> 1548888586 -0800
committer android-build-merger <android-build-merger@google.com> 1548888586 -0800

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

Change-Id: Iffcf21cec34011e5ae971198157d57a6e78c95e4