tree 8633ce6c08ab68a1925efdc60211dc1ed36f0d85
parent 2a70a1e349cb982ae68196195d4745474d8f2568
parent e77f99144f015d9044909a4c128fa916465b0671
author Dianne Hackborn <hackbod@google.com> 1296607989 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296607989 -0800

am e77f9914: Merge "Whoops, need to put this check back." into honeycomb

* commit 'e77f99144f015d9044909a4c128fa916465b0671':
  Whoops, need to put this check back.