tree e5c93a59a2fb2a6f1a3db20d4c826644e0404972
parent 8535518cb2202c7dfcdc378d762b0c1199e40e3b
parent e95a86cfec18836ddbff149690a13766bfc9ada3
author Xavier Ducrohet <xav@android.com> 1250952252 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1250952252 -0700

am e95a86cf: Merge change 22346 into donut

Merge commit 'e95a86cfec18836ddbff149690a13766bfc9ada3' into eclair

* commit 'e95a86cfec18836ddbff149690a13766bfc9ada3':
  Fix target for ApiDemos (API is now 4)