tree 11cf098b7f1847713409e1ab8a5883ad3b0075e5
parent c56af04f6bdc6fc59e9ef009adcf87374cddaf83
parent 5e7a5b6f525f2ecd070925097ee3c83fa9210d61
author Nick Kralevich <nnk@google.com> 1411856316 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411856316 +0000

am 5e7a5b6f: am 8919753d: Merge "Assign specific types to userdata and cache block devices."

* commit '5e7a5b6f525f2ecd070925097ee3c83fa9210d61':
  Assign specific types to userdata and cache block devices.