tree 28d1f0ed88c0b4134e90aeb95f4ff699de401788
parent 506774b00af5df9feceb19291c5f682071eed59c
parent b5cd4cc2d96390eaeb509051010b02bfb55ad7d5
author TreeHugger Robot <treehugger-gerrit@google.com> 1605674428 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1605674428 +0000

Merge changes Ib1db7caf,Icb295186,Iad1760c0,I02d4890d

* changes:
  Revert^2 "Do not cache bag parent stack until requested"
  Revert^2 "Cache resolved theme values"
  Set resource id correctly when resolve fails
  Revert^2 "libandroidfw hardening for IncFs"