| commit | 74d54102cce9f54c8538450504d6595a8cb3be4a | [log] [tgz] |
|---|---|---|
| author | Jae Shin <jaeshin@google.com> | Mon Oct 16 01:37:08 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 16 01:37:08 2017 +0000 |
| tree | 8366903038c30cff239cf501878f58a5a4ce328b | |
| parent | 977bbeed3e585e9d2d7733bd82b8855e0ac44943 [diff] | |
| parent | 9fe270641d72ad7aa02769fdc80e04bb9fed7c3a [diff] |
Merge changes from topic "keymaster_stl_none" am: b1de50e9b0 -s ours am: 9fe270641d -s ours Change-Id: I440e74449e892ac992b95aacf8c49e13e8bc8a94