tree 15b1099821a79f5be399706a33dc2da7342db8ef
parent 849bc02c4c44e1cee122d928bb6139efd05931c1
parent a850a5b7ad5ad4beb13d492e4ae8fe17f427aad4
author Conley Owens <cco3@android.com> 1332896448 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332896448 -0700

am a850a5b7: Merge "Assume the location of the out directory"

* commit 'a850a5b7ad5ad4beb13d492e4ae8fe17f427aad4':
  Assume the location of the out directory