tree d2af5d38a31ec9b103f865b75f7f2987dab2291f
parent 4475dbcacba57702f0bc1d3e5722f3cac97bdb6a
parent 0ab731340b162a14eb49b8df78a0e96eb6e3a934
author Doris Liu <tianliu@google.com> 1435102268 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435102268 +0000

am 0ab73134: Merge "Add enter/exit animation for window provided CAB" into mnc-dev

* commit '0ab731340b162a14eb49b8df78a0e96eb6e3a934':
  Add enter/exit animation for window provided CAB