tree ba924ed88727c43723633ca92a3260bf5dae5bc3
parent 5327322ab94711a654d41a5b53be3bf6a3a28a39
parent 6f680f524a66dabcf0d86d0f19f3855f8c5e594f
author Adam Koch <akoch@google.com> 1358172920 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358172920 -0800

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

* commit '6f680f524a66dabcf0d86d0f19f3855f8c5e594f':
  Displaying Bitmaps Efficiently Training - Change memory calculation