tree 12f15bf201a779cd6eb821702a73599d8a168e76
parent 63bb353e6aa7a6de56983d0d0c64ece081dcb8d4
parent 87c5a5088e555fb3bbd5f28f1eb85a0596d36250
author Derek Sollenberger <djsollen@google.com> 1434989234 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434989234 +0000

am 87c5a508: am f1c031d5: am b2aea9dc: Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev

* commit '87c5a5088e555fb3bbd5f28f1eb85a0596d36250':
  Enable Picture w/ HW Accelerated Canvas.