tree 83a050c55ad7c1e937f2eb901664f859b36ec6cb
parent b17f5e9b8e19553601804637077fe544d2e1038d
parent 983ce5738cee0bf78b87d6274fe1387129768302
author Nick Kralevich <nnk@google.com> 1342685596 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342685596 -0700

am 983ce573: Merge "Fix SELinux labeling for system.img"

* commit '983ce5738cee0bf78b87d6274fe1387129768302':
  Fix SELinux labeling for system.img