| commit | 35ebb0f47e8e1b658239ac7256c44fc7b241ab0c | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Fri Dec 12 23:41:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 12 23:41:44 2014 +0000 |
| tree | 4c4139f3dbdfa26444ae682cc04a7d6903a0dab7 | |
| parent | e1f506f9d4d28d5e00f9e592381328892a22f420 [diff] | |
| parent | 93294f38417b83cbbe3414773d64754863a0595d [diff] |
am 93294f38: am 166bb6a3: am 335b82ed: Merge "Add device info field for encryption" into lmp-sprout-dev * commit '93294f38417b83cbbe3414773d64754863a0595d': Add device info field for encryption