diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 00:53:03 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 00:53:03 +0000 |
| commit | 28e9852ad361927c33a3b76fae95474393be0e96 (patch) | |
| tree | dcf0f65504b4c3af275202bc49938893438b2ffb | |
| parent | 7e8eabb3d8f58ce30a6aeb8ad0d6ae6d62a69c7d (diff) | |
| parent | c2120744da8d0612ad54484b314f94e1e6e3a167 (diff) | |
| download | android_system_security-28e9852ad361927c33a3b76fae95474393be0e96.tar.gz android_system_security-28e9852ad361927c33a3b76fae95474393be0e96.tar.bz2 android_system_security-28e9852ad361927c33a3b76fae95474393be0e96.zip | |
Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
Conflicts:
keystore/keystore.cpp
Change-Id: I32d4dc7cee4a7b1996f31d76bae94d0a408cacc3
0 files changed, 0 insertions, 0 deletions