tree 8d49506f9661c4e4e2cbe18648d4c39aea288964
parent c74403b4c9c8acae326b39f06905a3a291a5471f
parent cd1a65b69ad2da81e654adab8edeead457a1b1f5
author Tom Cherry <tomcherry@google.com> 1441389754 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441389754 +0000

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

* commit 'cd1a65b69ad2da81e654adab8edeead457a1b1f5':
  move uncrypt from init.rc to uncrypt.rc