tree fe921b986906c117609004d4c4c7af0d6aa58afe
parent 67af236dc582e6350a3bf06ce78d5b21791b1a0a
parent 026e219f780a1d257e78fe80419a10655dc615a8
author Kenny Root <kroot@android.com> 1333760864 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333760864 -0700

am 026e219f: am b22f6853: Merge changes I5a63fd61,I7c6f59fe

* commit '026e219f780a1d257e78fe80419a10655dc615a8':
  Support the setting of file security contexts in OTA and update packages.
  Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.