tree 775980d368b4b36aee2352c460a320cc8ccb2c5d
parent df55bf45e8ebcf699b9b4574db9119809935c549
parent f441557d89cab8885940bb63a27159f576749f96
author Chris Craik <ccraik@google.com> 1418245290 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418245290 +0000

am f441557d: Merge "Fix frame-allocated path lifecycles" into lmp-mr1-dev

* commit 'f441557d89cab8885940bb63a27159f576749f96':
  Fix frame-allocated path lifecycles