tree fd16ece75a6791cf9f74d37008934cf199ed9d66
author android-build SharedAccount <android-build@google.com> 1237005781 -0700
committer android-build SharedAccount <android-build@google.com> 1237005781 -0700

auto import from //branches/cupcake_rel/...@138607