tree 8ab7ca76ae92aeb94beaffe8732687d9068f6ff9
parent e5fe50fb133e3f464c4bf1a408636f2ff338e3bb
parent 22fed877d14862b1aa4c9c2f92a4c83be6d85ed4
author Nick Kralevich <nnk@google.com> 1429897060 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429897060 +0000

am 22fed877: am ac699569: am f0b47920: Merge "Revert "Remove now-unusable \'setcon\' command.""

* commit '22fed877d14862b1aa4c9c2f92a4c83be6d85ed4':
  Revert "Remove now-unusable 'setcon' command."