tree 802acc42d7113d4fd8add6700393058549213505
parent b916f6f17f072f2f95097fd555175956a739ee8f
parent 015b8a66db5bbc1ad092d5562730d90b6a485c1d
author Jeff Brown <jeffbrown@google.com> 1279214650 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279214650 -0700

am d1313da5: am eb6e0df1: Don\'t build framework tests for simulator target.

Merge commit 'd1313da5999e06be16e52527cfba443f66b333a1'

* commit 'd1313da5999e06be16e52527cfba443f66b333a1':
  Don't build framework tests for simulator target.