tree 4b94ff5a755faf378fc513428f3772c74788cbf4
parent 62de483601291e97f3d1eeecd21819155b27649e
parent 2a75bcf9bf79babcafa07e0a0f222f2f0c3390f7
author Aaron Whyte <awhyte@google.com> 1434137677 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434137677 +0000

am 2a75bcf9: am 0c8d8e4c: Moves sample watchface bitmap scaling to onSurfaceChanged().

* commit '2a75bcf9bf79babcafa07e0a0f222f2f0c3390f7':
  Moves sample watchface bitmap scaling to onSurfaceChanged().