tree d713f51faced6e17f95e7b53ea9b463c4cd94692
parent ea66e3bf3510df7ab3051c90a740b8e11de42e92
parent 79622ebe5dd09754be0a5643413d11ecca300336
author Joe Onorato <joeo@google.com> 1345187525 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345187525 -0700

am 79622ebe: Merge "use LOCAL_PATH properly"

* commit '79622ebe5dd09754be0a5643413d11ecca300336':
  use LOCAL_PATH properly