tree 1bc0dee1f78605f6a8fe61aa930f7eaf3ca56c9a
parent 395b9c672528eca830e7d3261ecd16ae53131d2c
parent 93a1f7aef9998efedba08fa99ba378488d092b4c
author Elliott Hughes <enh@google.com> 1375147325 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1375147325 -0700

am 93a1f7ae: Merge "Minor makefile cleanup."

* commit '93a1f7aef9998efedba08fa99ba378488d092b4c':
  Minor makefile cleanup.