summaryrefslogtreecommitdiff
path: root/tools/aapt/Resource.cpp
diff options
context:
space:
mode:
author Alex Klyubin <klyubin@google.com> 2015-04-03 19:43:43 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-04-03 19:43:43 +0000
commitb068f162a4670287aa66d6b193c84ccd01e3417e (patch)
tree0635bd152ba5e60f52bd93b3589225ccc504bfbd /tools/aapt/Resource.cpp
parent54d583c148fd14034afc751ad70ab772de55eb92 (diff)
parent376b23e6fdda35cc6fa61ea9a3c10d109fe2d601 (diff)
am 376b23e6: am 08963653: Merge "Rename KeymasterException to KeyStoreException."
* commit '376b23e6fdda35cc6fa61ea9a3c10d109fe2d601': Rename KeymasterException to KeyStoreException.
Diffstat (limited to 'tools/aapt/Resource.cpp')
0 files changed, 0 insertions, 0 deletions