| commit | 116d81ae27514b5d3d7517bfee47d164ed7e1ef6 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Wed Jan 28 21:21:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 28 21:21:29 2015 +0000 |
| tree | 860180f6970bf12f4669a0b1c46bcdfdedad4799 | |
| parent | 2e14f61731adbb1f0d0d54bab82bc2f0ecee6a11 [diff] | |
| parent | 07dcb12e3ee7b7a6f959ae531ffe87f038786730 [diff] |
am 07dcb12e: Merge changes If22008be,Id0049ce6 * commit '07dcb12e3ee7b7a6f959ae531ffe87f038786730': Make encryption configurable Provide a way to select force encryption from vendor partition