tree d295c8c362e5dd347e7e992becc30f2024da0807
parent 148f1a83733ad207e64a11812906a2acf6674eb1
parent 97f1dafc0cd3de51127477b8a0650883c0e657e8
author Elliott Hughes <enh@google.com> 1420847524 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420847524 +0000

am 97f1dafc: Merge "Remove makefile cruft."

* commit '97f1dafc0cd3de51127477b8a0650883c0e657e8':
  Remove makefile cruft.