tree 56f07980293270d97438416fcc8687885c6dda5b
parent 217f3c11accdefd36cfe4e5e34a2a354eb2cbc6c
parent f62f189890200bf605a303350b3b3204837e19a6
author Bill Yi <byi@google.com> 1444561591 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444561591 +0000

am f62f1898: am a636e882: am e9e81278: Merge "e2fsprogs: export uuid/uuid.h"

* commit 'f62f189890200bf605a303350b3b3204837e19a6':
  e2fsprogs: export uuid/uuid.h