tree af3e11e69080d78687f3c3942c1b96f89d1314cc
parent b00a8a066f5b6ae5b8d0c03ee7f680389b38a260
parent 30c13c4954a959c2e6c5ba126f26d88b2e56be61
author Tom Cherry <tomcherry@google.com> 1441389387 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441389387 +0000

am 30c13c49: Merge "move uncrypt from init.rc to uncrypt.rc"

* commit '30c13c4954a959c2e6c5ba126f26d88b2e56be61':
  move uncrypt from init.rc to uncrypt.rc