tree 1c718865173333583b7c42e17a6526677ce4f3b4
parent c7084e63dae96c56bf8301afe70685c9619cacda
parent 0fdf0dc725a130b39a4232262b77c17ff053ef23
author Christopher Ferris <cferris@google.com> 1394156010 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394156010 +0000

am 0fdf0dc7: Merge "Refactor makefile."

* commit '0fdf0dc725a130b39a4232262b77c17ff053ef23':
  Refactor makefile.