summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Michal Karpinski <mkarpinski@google.com> 2016-09-23 07:01:48 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-09-23 07:01:51 +0000
commit69659cb96df2b149bbb0577179f16712054a8bc2 (patch)
tree64b68fb7e9425f4d0abdbc68633f47b74a23ea4b /libs/androidfw/AssetManager.cpp
parent417748f0641ad94d0abd930d07c000cac778a8e3 (diff)
parent0b72a722edacfd790178a2a6183bb985656b2887 (diff)
Merge "Fingerprint Strong auth timeout" into nyc-mr1-dev
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions