tree da7f5b66dc3593d57dc0c66c654caeec44013878
parent efef45ede6f7588bd3f584d7746ca9822ade58ac
parent 7fdeb1f9d7c1e979ebf78725bbf000bcb8c6ffc3
author Ed Heyl <edheyl@google.com> 1381272346 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381272346 -0700

am 7fdeb1f9: merge in KQS81M

* commit '7fdeb1f9d7c1e979ebf78725bbf000bcb8c6ffc3':
  Don't apply permission changes to symlink.
  recovery: fix use of init reboot method