tree dd0dafb3ea635859de07eb21421c771e57c0cca0
parent feed169b3c9215c9fd91caca22f55fef92f2ef74
parent 335b82edac94996fe27a282d21f0a502426e1285
author Paul Lawrence <paullawrence@google.com> 1418424797 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418424797 +0000

am 335b82ed: Merge "Add device info field for encryption" into lmp-sprout-dev

* commit '335b82edac94996fe27a282d21f0a502426e1285':
  Add device info field for encryption