tree dd1b6245fc65d992fd243488931cb2c95ad83404
parent a55ec9c2abfd8a8bd216f133ec925e9db1d69ae7
parent a270264c61daa42a5b03bbb1e7f23e77780f8fc0
author Alex Klyubin <klyubin@google.com> 1428689367 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428689367 +0000

am a270264c: Merge "Track more changes to keymaster_defs.h"

* commit 'a270264c61daa42a5b03bbb1e7f23e77780f8fc0':
  Track more changes to keymaster_defs.h