tree c73fde2341791f675ce17f9545c4a90350ef8842
parent ddb30cd36f7a3e8a9369d5c1d735a6441c7c0216
parent 5aeb085389954a32e1ea2189b7bec8080b0226c5
author Chad Brubaker <cbrubaker@google.com> 1427310208 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427310208 +0000

am 5aeb0853: Merge "Enforce tag types in KeymasterArgument classes"

* commit '5aeb085389954a32e1ea2189b7bec8080b0226c5':
  Enforce tag types in KeymasterArgument classes