summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2021-04-27 17:24:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-04-27 17:24:27 +0000
commitd749dc351002a1abc3d86c76a6993adab23e23f4 (patch)
treed6a7b4c243615f2e29caac27255fa4e9c3be8414 /libs/androidfw/AssetsProvider.cpp
parent1c750cd36732ab6d16f622b64941a32b05a4084b (diff)
parent3b0fc6bd38a234a0221cc663eddda294d660f905 (diff)
Merge "Restrict alarm broadcast" into oc-mr1-dev am: 3b0fc6bd38
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14103469 Change-Id: I2a933b691bfc17ed88f60e21c1083bc947d5b329
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions