| commit | d933fc0c05c9dff977ec6824cecb37e49a5b28ff | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Mon Feb 09 04:14:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 09 04:14:22 2015 +0000 |
| tree | b240b4c7d4c430641c038e7d2203ed3d18e5dbec | |
| parent | 14b964f52ebf9a4e86fdb1ced0ca4d9a3cb6fcab [diff] | |
| parent | a1738915329e704ea52fc09c222bb4893e6e51df [diff] |
am a1738915: am 317b4024: Revert "Make encryption configurable" * commit 'a1738915329e704ea52fc09c222bb4893e6e51df': Revert "Make encryption configurable"