tree e854933ff9b8eb64e9f6663de12e2fa301006e80
parent 1acfedf9cc1e5b4ef9da4da7302ec09366acb8b4
parent 973d9ace4ab733c2220713d0624e5014bccbf148
author Nick Kralevich <nnk@google.com> 1425140773 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425140773 +0000

am 973d9ace: Merge "grouper: label boot block device"

* commit '973d9ace4ab733c2220713d0624e5014bccbf148':
  grouper: label boot block device