tree b8aaf10b0095b12dde830286635a73c05893b52d
parent 617055d7a9e2c30d1a99bf7e596f8d9e32fab723
parent 2c76016cbc1e426ab30d322745dfb6d4e6784138
author Derek Sollenberger <djsollen@google.com> 1368100972 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368100972 -0700

am 2c76016c: Merge "Fix error where clips/matrices are incorrectly transferred." into jb-mr2-dev

* commit '2c76016cbc1e426ab30d322745dfb6d4e6784138':
  Fix error where clips/matrices are incorrectly transferred.