tree 0b7244743a862b9fef7a417d350176892f669ed0
parent a40166d11c597038b30eab6122f8967ee1c810b3
parent d01d0bf86c2309a7a950549c9c124b303c0c3f82
author Ying Wang <wangying@android.com> 1357342228 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357342228 -0800

am d01d0bf8: am 58a87c5c: Merge "core/Makefile: Allow specification of file locations"

* commit 'd01d0bf86c2309a7a950549c9c124b303c0c3f82':
  core/Makefile: Allow specification of file locations