diff options
| author | Daniel Norman <danielnorman@google.com> | 2020-12-23 00:01:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-23 00:01:53 +0000 |
| commit | 4209c4bc3f9bf48a98ad403f56a25e5bd5a92c74 (patch) | |
| tree | 83b666a384d87cbf285fb35a7fbd48d6d1f9708d /libs/androidfw/AttributeResolution.cpp | |
| parent | 137003fd245308cb05b0aa46f076bd4e1156c5af (diff) | |
| parent | f15eb86be01bac918eb0d89231c7643b37c3ca56 (diff) | |
Merge "Updates noparent to only apply to the per-file files." am: ea8ca4b88a am: 96acd833fc am: f15eb86be0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535381
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d16d3b3d878c698bd0fc650bc25dc50c41e5bbc
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions