tree 2be56f2e1697cf8946d8ce369eb9c63554119daa
parent 033640c40440c1813b77f1f048dee4e720c49db4
parent 5127626b4a7d998a75d366bf1128be91c6047dc0
author Christopher Ferris <cferris@google.com> 1391209880 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391209880 +0000

am 5127626b: am 3133a4a2: am 0fdf0dc7: Merge "Refactor makefile."

* commit '5127626b4a7d998a75d366bf1128be91c6047dc0':
  Refactor makefile.