commit aa98d509500ba963f9dcda55073f312ee643cb46
author Adam Koch <akoch@google.com> Fri Sep 07 13:17:45 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 07 13:17:45 2012 -0700
tree b02a81d01fafd0b3cbbe8f9c8b4bf10e6439dc1d
parent 21d8331d610bb641e63e9f7ff00bb5db8f97f283
parent 6525f7bfcfaf66fe0d549cb3c3d22a751535932e

am 6525f7bf: Merge "Updates to "Displaying Bitmaps Efficiently" class. Changes:  -Updated code sample (see http://ag/214812)  -Updated code snippets to match updated sample  -Fixed <> in code snippets  -Updated disk cache section  -Some other minor updates" into jb-de

* commit '6525f7bfcfaf66fe0d549cb3c3d22a751535932e':
  Updates to "Displaying Bitmaps Efficiently" class. Changes:  -Updated code sample (see http://ag/214812)  -Updated code snippets to match updated sample  -Fixed <> in code snippets  -Updated disk cache section  -Some other minor updates