| commit | eb44d8146b8d1123699f75498b802ff7cac0f54f | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Wed Sep 28 20:21:27 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 28 20:21:27 2016 +0000 |
| tree | b75bd1bba188a56f1c45275c49126585a32f5b78 | |
| parent | 26457f431510ed5b78c2713b4261a46dc2096b70 [diff] | |
| parent | 0b7e6492354accfa1430846f14e39095c57c21dd [diff] |
Merge "keystore: use static_cast for conversion between void* and uinti8_t*" am: e260a43a7e am: 0b7e649235 Change-Id: I48cc0cd45799c1dbdf05dac41a058f4196eb6d47