tree 590f8fabf034acd97e79ac02fa1122e4cd6289d0
parent 7e2a3608b6fa51c884e051625e10d13597cb8796
parent 68fdeaadc621b7a9200f5c75790eb756a1983d02
author Adam Cohen <adamcohen@google.com> 1429649924 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429649924 +0000

am 68fdeaad: (-s ours) Stop using custom activity transition, rely on system default in these cases

* commit '68fdeaadc621b7a9200f5c75790eb756a1983d02':
  Stop using custom activity transition, rely on system default in these cases