tree 8f97d802d568ceac7dcd1e71e25e46f262c992bf
parent f0121c574ede0898e36eeba0a0e0affd0f8d81a7
parent 959de99af47dec9ed7a3499ce57e4097be399d7d
author Mohamad Ayyash <mkayyash@google.com> 1428432248 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428432248 +0000

am 959de99a: am f8c905e0: Merge "Add dependency on libsquashfs_utils due to fs_mgr dependency"

* commit '959de99af47dec9ed7a3499ce57e4097be399d7d':
  Add dependency on libsquashfs_utils due to fs_mgr dependency