OSDN Git Service

am ba2836e6: Merge "Track recent keymaster_defs.h changes."
authorAlex Klyubin <klyubin@google.com>
Fri, 10 Apr 2015 00:22:45 +0000 (00:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Apr 2015 00:22:45 +0000 (00:22 +0000)
commit5f8c17b9f6d574eca6a24ddb2f7cc98a37f5aaea
treed3430fd25c5d306eab58799e2a6a47cb072eca4a
parent82cba6aa3792b7d3b7eddf32c64cbf4a7a47e5a5
parentba2836e6cf5a00855e470705741d9e4b9b1a9df9
am ba2836e6: Merge "Track recent keymaster_defs.h changes."

* commit 'ba2836e6cf5a00855e470705741d9e4b9b1a9df9':
  Track recent keymaster_defs.h changes.