diff options
author | The Android Automerger <android-build@google.com> | 2014-06-06 15:42:04 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-06 15:42:04 +0000 |
commit | e8d59957d4935fb737ee3604d21b34fa3afb7e95 (patch) | |
tree | a60c81346b17254696b29a4fb620e939ab728e6e | |
parent | f2ffd556fd55626adaf00af42db05dfa1a6a1e47 (diff) | |
parent | 2d8aa1e31fda7fd88c1b2d99c976832dd5374490 (diff) | |
download | android_hardware_qcom_keymaster-e8d59957d4935fb737ee3604d21b34fa3afb7e95.tar.gz android_hardware_qcom_keymaster-e8d59957d4935fb737ee3604d21b34fa3afb7e95.tar.bz2 android_hardware_qcom_keymaster-e8d59957d4935fb737ee3604d21b34fa3afb7e95.zip |
am 2d8aa1e3: merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62b36d9c25f9
* commit '2d8aa1e31fda7fd88c1b2d99c976832dd5374490':
Set correct module version for qcom keystore
0 files changed, 0 insertions, 0 deletions