tree f691707560a99b0967a1b333b8248386d418d56a
parent ba95be58c596aa7b5034b1bce8f3fde97ae08780
parent 703b87de5b84e24ea119556dcc3683cb4ce941cf
author Leo Wang <leozwang@google.com> 1420766271 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1420766271 +0000

Merge "Provide a way to select force encryption from vendor partition" into lmp-mr1-dev