diff options
author | Doug Zongker <dougz@google.com> | 2014-03-17 23:33:14 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-17 23:33:14 +0000 |
commit | a68c517c628acdcfd0107536f34c3fd882ce0629 (patch) | |
tree | bf08d4b39df094d50b0b671297b2fb807f5f40f8 /verifier.h | |
parent | 76b245c24c12feec2381c423de2f7ffe4b78d7f0 (diff) | |
parent | 80c1a386d3f614919708b37986919ecaf74ee738 (diff) | |
download | bootable_recovery-a68c517c628acdcfd0107536f34c3fd882ce0629.zip bootable_recovery-a68c517c628acdcfd0107536f34c3fd882ce0629.tar.gz bootable_recovery-a68c517c628acdcfd0107536f34c3fd882ce0629.tar.bz2 |
am 80c1a386: resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aosp
* commit '80c1a386d3f614919708b37986919ecaf74ee738':
refactor image resource loading code in minui
Diffstat (limited to 'verifier.h')
0 files changed, 0 insertions, 0 deletions