| commit | ef87a17a2a985645245357c7eddcc80033b18db4 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Wed Jan 28 21:21:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 28 21:21:30 2015 +0000 |
| tree | a30c438f80e682b48652deecae4bcd06d64a74bd | |
| parent | 44a307b05472074ab386d432fe996f4bc63f3bad [diff] | |
| parent | fcca3faad48fc37be78a7307ee94b1b55cb89f16 [diff] |
am fcca3faa: Merge "Make encryption configurable" * commit 'fcca3faad48fc37be78a7307ee94b1b55cb89f16': Make encryption configurable