tree 64a0b7a1e4dceaedde8dc28eca9166134d32cd75
parent d1e748c071fdf3508c371f0806614d5f67437333
parent 9b19382f0e55be199da4b3f604fc114aba8fb2fc
author Mohamad Ayyash <mkayyash@google.com> 1425513706 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425513706 +0000

am 9b19382f: resolved conflicts for merge of fc759204 to stage-aosp-master

* commit '9b19382f0e55be199da4b3f604fc114aba8fb2fc':
  Allow flashing a squashfs system image