tree 0e4a63ca8bae2ec6788f5491b9099dbc1be38fe6
parent a9e24fdeb275a2afc964f511583795052801ad65
parent 721f3bc56989b5f4101e646a02d598ddb4a7ff6e
author JP Abgrall <jpa@google.com> 1403722017 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403722017 +0000

am 721f3bc5: Merge "lib/uuid: make a static library also"

* commit '721f3bc56989b5f4101e646a02d598ddb4a7ff6e':
  lib/uuid: make a static library also