tree ec3fe1ab3ada335c10e6ed994aafab3f12598550
parent 9e989ab695ffbc9bb4f5a41ebc13cfd61524f987
parent 8203a3f918022fa055084724df4b14d63d4c8937
author Andreas Gampe <agampe@google.com> 1506981843 +0000
committer android-build-merger <android-build-merger@google.com> 1506981843 +0000

Merge "Keymaster: Move test to std::unique_ptr" am: 4428c1f0c0 am: 1594c64b69 am: 59e7178711
am: 8203a3f918

Change-Id: If562bb465d0dcb585899c0f2aaee70e57cb54005