tree 12371bae4d12e11ebb385e548c0f9d41bef99e82
parent eda7f59f24ccf222adee2f451700ad144477a280
parent 8625c7957ccb71e11c79137ff58be6fe066da0bd
author Michael Jurka <mikejurka@google.com> 1307744473 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307744473 -0700

am 8625c795: (-s ours) am 385d0519: am b16a6d6e: Merge "DO NOT MERGE Fix rotation and memory use bugs" into honeycomb-mr2

* commit '8625c7957ccb71e11c79137ff58be6fe066da0bd':
  DO NOT MERGE Fix rotation and memory use bugs