tree 1fd8b56aa58142916ae038c7549b57b3d6bb2314
parent aac44855caf0f2f7f2e655fc06ce9782b9c80af7
parent 5054f7ee4fa6e747eb8d08f60ec91ba6a9363878
author Shawn Willden <swillden@google.com> 1424993470 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424993470 +0000

am 5054f7ee: Merge "Rename keymaster_device_t to keymaster0_device_t."

* commit '5054f7ee4fa6e747eb8d08f60ec91ba6a9363878':
  Rename keymaster_device_t to keymaster0_device_t.