am 07dcb12e: Merge changes If22008be,Id0049ce6

Browse Source

* commit '07dcb12e3ee7b7a6f959ae531ffe87f038786730':
  Make encryption configurable
  Provide a way to select force encryption from vendor partition

...

This commit is contained in:

Paul Lawrence 2015-01-28 21:21:29 +00:00 committed by Android Git Automerger

parent 2e14f61731 07dcb12e3e

commit 116d81ae27

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available