tree 46aacb687e7126a5a64949dd7ade2f284ee57c15
parent 62947db579fa7acc9ee01d71f3aeb30add3df260
parent 155cd3c155004433215147437cdf71844c9efd87
author Kenny Root <kroot@android.com> 1333147997 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333147997 -0700

am 155cd3c1: Merge changes Ied379f26,I09fb9d56

* commit '155cd3c155004433215147437cdf71844c9efd87':
  Extend recovery and updater to support setting file security contexts.
  Add libselinux to LOCAL_STATIC_LIBRARIES wherever libext4_utils is used.