| commit | adc385c265c1c209db2f919840853477fe23c328 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Tue Apr 28 21:10:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 28 21:10:37 2015 +0000 |
| tree | 68fedd9b263bb0b08899eb6eedf710587633dad1 | |
| parent | 897c1d4e00ed42d4f08b72fbdb0d337b2636d2b0 [diff] | |
| parent | 2306880f07c01f39b9f6f5d3e3aee3e2ca945adf [diff] |
am 2306880f: am 6e8c8f54: Merge "Revert "Only run vold command when file encryption enabled"" * commit '2306880f07c01f39b9f6f5d3e3aee3e2ca945adf': Revert "Only run vold command when file encryption enabled"