OSDN Git Service

Merge changes from topic "dynamic-ref-se-mnc-dev" into mnc-dr-dev
authorRyan Mitchell <rtmitchell@google.com>
Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)
commit70e4dec56bbcf618cc300a85af99630075ca98ff
tree0afa761c14f7d97cc2abb1ff66c40ccae1b52685
parentac3afe60a5822ab62c7d92eced414694520f1ebf
parentd65dbf91ce12c85a302d7cce7922d3a7ba7f7580
Merge changes from topic "dynamic-ref-se-mnc-dev" into mnc-dr-dev

* changes:
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0
  Fix DynamicRefTable::load security bug
libs/androidfw/ResourceTypes.cpp