tree ded982cd6955b7be6cf6b079a901929b300e7faf
parent 5c828c748de090be12ff74ecf4741d8cecf13d31
parent 7ffbbc276cfc9748a116dca3e8dac99c6b4490b4
author Adam Koch <akoch@google.com> 1360012618 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360012618 -0800

am 7ffbbc27: am 01e89434: am 1826e8c3: am 3ef2c026: am 376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)

# Via Android Git Automerger (4) and Adam Koch (1)
* commit '7ffbbc276cfc9748a116dca3e8dac99c6b4490b4':
  Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)