tree 5c70bdaf8b72abca1bad6f45a628a8a84af11c85
parent 83200c8da058269219a6d66b264984bb167ae04b
parent e1013b7107aa29e75d74432284f0931ed8d2d4e8
author Brad Ebinger <breadley@google.com> 1550601231 -0800
committer android-build-merger <android-build-merger@google.com> 1550601231 -0800

Merge "Fix the drawable resource can't be loaded from RRO package" am: a6f40828e8 am: eebce05fdf
am: e1013b7107

Change-Id: I6a30cb3c2a9aec53ee5f322f3fd9127818ee933e