| commit | 2f36e6de97d1e9b6e21538edfdddab28aa14ad31 | [log] [tgz] |
|---|---|---|
| author | Divya Sharma <c_shard@codeaurora.org> | Wed Nov 04 11:33:49 2015 -0800 |
| committer | Divya Sharma <c_shard@codeaurora.org> | Wed Nov 04 11:35:55 2015 -0800 |
| tree | dcf0f65504b4c3af275202bc49938893438b2ffb | |
| parent | 7e8eabb3d8f58ce30a6aeb8ad0d6ae6d62a69c7d [diff] | |
| parent | c2120744da8d0612ad54484b314f94e1e6e3a167 [diff] |
Merge tag 'android-6.0.0_r26' into HEAD Android 6.0.0 release 26 * tag 'android-6.0.0_r26': Wrap incomplete keymaster1 implementations with sw keymaster. Conflicts: keystore/keystore.cpp Change-Id: Ib630bf22dc50de7b15f7a0729bc926eddc9523ce