tree c0d582470fa313db052b6c6239efb8cc99f2ba4d
parent 79ba31cccaa81b92eca35b2ba1a9438ab9987f73
parent 22633476f76182e10641362b5632bf5d27bd6e82
author Adam Cohen <adamcohen@google.com> 1429655977 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429655977 +0000

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

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