tree 5e4e5d611ce613dd9ecab812df2c5ae29ee6219c
parent 531d348d6e37deb751efbefc0613934c5a80de1d
parent 709bb0f79ced522e5fb145182472ee4063b85368
author Elliott Hughes <enh@google.com> 1344548760 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344548760 -0700

am 709bb0f7: Merge "Remove ThirdPartyProject.prop."

* commit '709bb0f79ced522e5fb145182472ee4063b85368':
  Remove ThirdPartyProject.prop.