tree 82a656b736b19ed62cf3512eeb7fc1546ee780ac
parent baf974fa5aaf9977fa1dc26a33ada4e7d68768c0
parent 96a6063943d725c9febc2bc525cb8be648c34fa5
author kmccormick <kmccormick@google.com> 1363386713 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363386713 -0700

am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs

* commit '96a6063943d725c9febc2bc525cb8be648c34fa5':
  Doc update: Add memory mgt lesson to bitmaps class