tree 9636630f00318709aa8e9880b4968921be613091
parent dc4ea4f1524f357378e14255ecc447467a175d03
parent 7a864af1b72a278d7e83f2f1f6ac6da587d658c8
author David Turner <digit@google.com> 1420663317 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420663317 +0000

am 7a864af1: am aa112716: Merge "build_image: Set file system labels on disk images"

* commit '7a864af1b72a278d7e83f2f1f6ac6da587d658c8':
  build_image: Set file system labels on disk images