commit 14c625188affcce2e6db3c8b2f96b63eeb0f10a0
author Adam Koch <akoch@google.com> Fri Sep 07 13:20:16 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 07 13:20:16 2012 -0700
tree f89bde8c23d4311dce47278f5542bb8eebabc609
parent 970683c5d42a1d8588d656d4e570ce4f0f6e0abc
parent aa98d509500ba963f9dcda55073f312ee643cb46

am aa98d509: 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 update

* commit 'aa98d509500ba963f9dcda55073f312ee643cb46':
  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