tree 026cecf04c6421e24d78cb9cdb5e27881d353c0b
parent 198e6757b1051b3285e4bdc5f409b53ba27b4bd5
parent 1ee2974280807d6cbfe469ee8daf41306da258eb
author Nick Kralevich <nnk@google.com> 1413673735 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413673735 +0000

am 1ee29742: am f7855cd8: Merge "Assign specific types to system and recovery block devices."

* commit '1ee2974280807d6cbfe469ee8daf41306da258eb':
  Assign specific types to system and recovery block devices.