summaryrefslogtreecommitdiff
path: root/libs/androidfw/BackupHelpers.cpp
diff options
context:
space:
mode:
author Victor Chang <vichang@google.com> 2016-04-22 11:06:54 +0000
committer android-build-merger <android-build-merger@google.com> 2016-04-22 11:06:54 +0000
commit28b1df3b8abffc25fe0b04391e2ce4d0f8ece966 (patch)
tree8ecc9f3e7cd93bd69baa74bc98761ea2c2a0ecbf /libs/androidfw/BackupHelpers.cpp
parentc82ad7d8719166261fd91b61c1bfac15bf2d8aa4 (diff)
parentc0440e5f4dfa695d2347c68bbec787d3e16847eb (diff)
Merge "Deleting lock screen clears all CA approvals" into nyc-dev
am: c0440e5f4d * commit 'c0440e5f4dfa695d2347c68bbec787d3e16847eb': Deleting lock screen clears all CA approvals Change-Id: I692e07ace66056c2469a9c217fedfe96b4290b7d
Diffstat (limited to 'libs/androidfw/BackupHelpers.cpp')
0 files changed, 0 insertions, 0 deletions