tree 6ffc3fbb6dc7596fc1ac038fb949a94191983716
parent b99641c2de5100f2c7f77c0b9c51009e6f8f4805
parent 81fa100d3fc5b82411b408a6b0631738699172e7
author Scott Main <smain@google.com> 1333730955 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333730955 -0700

am 81fa100d: am 4480ff41: am cbece732: Merge "Sample app for Android U class: Displaying Bitmaps Efficiently" into ics-mr1

* commit '81fa100d3fc5b82411b408a6b0631738699172e7':