tree 7a1dccc4a7c39fb72910499fde86e98ff64752df
parent 2495d08a5c06556deb7c3993add337037b8b492e
parent 1a551b1614a1717fab7955bb712f8f8b35e22be9
author Adam Koch <akoch@google.com> 1358184508 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358184508 -0800

am 1a551b16: am 6f680f52: Displaying Bitmaps Efficiently Training - Change memory calculation

* commit '1a551b1614a1717fab7955bb712f8f8b35e22be9':
  Displaying Bitmaps Efficiently Training - Change memory calculation