commit | 8e9d9c990cd6d270d50ba7fd7334fc8d8efe10f7 | [log] [tgz] |
---|---|---|
author | Paul Lawrence <paullawrence@google.com> | Thu Sep 03 22:06:27 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 03 22:06:27 2015 +0000 |
tree | 2c7974fd1ea3290016cc98ce7d3950a503f2950e | |
parent | 63cf6b548ccf152af0fd308b9c24e2fb9c5148f8 [diff] | |
parent | 335b82edac94996fe27a282d21f0a502426e1285 [diff] |
am 335b82ed: Merge "Add device info field for encryption" into lmp-sprout-dev * commit '335b82edac94996fe27a282d21f0a502426e1285': Add device info field for encryption