tree d713f51faced6e17f95e7b53ea9b463c4cd94692
parent e61512ea0d8dc46964cd967fcd0f5ced22ee674b
parent 0256c986f7ff678bee07ca0462505e1de18efa62
author Joe Onorato <joeo@google.com> 1345187908 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345187908 -0700

am 0256c986: am 79622ebe: Merge "use LOCAL_PATH properly"

* commit '0256c986f7ff678bee07ca0462505e1de18efa62':
  use LOCAL_PATH properly