tree f0ccaef403fadf36abda489efbe85b206c3057b6
parent fd53a3bf82fe0b4d0d2b53e5d8bdf020e5fb3c9c
parent 4bc10de99f3f84b89b40c46203cbc051224f931d
author Tom Cherry <tomcherry@google.com> 1441390380 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441390380 +0000

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

* commit '4bc10de99f3f84b89b40c46203cbc051224f931d':
  move uncrypt from init.rc to uncrypt.rc