tree 528093dc8386ed1787c1160b49705ccdad6f5fa7
parent 2c151620376568ef6d86bfc7844f20b6dc4a5bf8
parent 4a43e79f73f9da747896123e383f9dc6013436fd
author Brian Carlstrom <bdc@google.com> 1415214095 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415214095 +0000

am 4a43e79f: Merge "Fix dependency from phony targets to real files to remove need for m or mma"

* commit '4a43e79f73f9da747896123e383f9dc6013436fd':
  Fix dependency from phony targets to real files to remove need for m or mma