OSDN Git Service

Merge "Add attestation API to Android KeyStore." into nyc-dev
authorShawn Willden <swillden@google.com>
Tue, 9 Feb 2016 22:57:23 +0000 (22:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 9 Feb 2016 22:57:24 +0000 (22:57 +0000)
1  2 
api/current.txt
api/system-current.txt
api/test-current.txt

diff --cc api/current.txt
Simple merge
Simple merge
Simple merge