tree cbd44a1b2a829a2a117e44d804e9d8f9a5059731
parent ce06e78db1280a91f3bba1cf5ca7a2cfbbf49492
parent 818a7bbfb42061d67aae0d5c725cecd0261c9643
author Adam Powell <adamp@google.com> 1295502870 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295502870 -0800

am 818a7bbf: Merge "Better fix for bug 3112733" into honeycomb

* commit '818a7bbfb42061d67aae0d5c725cecd0261c9643':
  Better fix for bug 3112733