summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Sudheer Shanka <sudheersai@google.com> 2022-04-19 02:52:38 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-04-19 02:52:38 +0000
commit8a4c3cc16aa7c0013f6cd7ecf88f97e57616c537 (patch)
tree9522f63b25b035589e6265c6bddbbf3af0642d7e /libs/androidfw/AttributeResolution.cpp
parent6a435bb6bbf78a1d2414163899517b4d4ce08284 (diff)
parent664ded5de3ba527ce29719c8b4e4cbdd209c6d93 (diff)
Merge changes I8aca6ac9,I995f7c6e into tm-dev
* changes: Migrate NETWORK_ACCESS_TIMEOUT flag to DeviceConfig. Don't hardcode the blocked reasons in AMS.
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions