am 45895d74: am 7fd5c53c: Merge "Displaying Bitmaps Efficiently Training - updates for KitKat inBitmap changes Bug: 10411797" into klp-dev

* commit '45895d743dc3c0d37a097e83b1d46095ac5e2db0':
  Displaying Bitmaps Efficiently Training - updates for KitKat inBitmap changes Bug: 10411797