Android CTS 7.0 Release 6 (3670477)
Merge "Don\'t build for froyo. That\'s just silly."
am: ce50ba50df

* commit 'ce50ba50df1890fff70e76f2f0a28e22e2bbb4da':
  Don't build for froyo. That's just silly.