tree 6cd9ad78a141183b0c34d74a3a1e7cb03828a33c
parent 6f5b83fd04a392260cd600941ae2731138583441
parent b61009d97029003bd9f2eed34bfba92b1c3555b0
author Elliott Hughes <enh@google.com> 1354724732 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354724732 -0800

am b61009d9: Merge "Simplify makefile."

* commit 'b61009d97029003bd9f2eed34bfba92b1c3555b0':
  Simplify makefile.