tree 6a596bf275d69e37937ddca9e91c1750a482b1e9
parent 1b3195cb917dcaff5d563d3e17e497b855442461
parent f8c303f9c197ed9247dbc88a5bf392f1f2c65639
author Tom Cherry <tomcherry@google.com> 1441389388 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441389388 +0000

am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc"

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