tree cd013d0898ec311b043d383484c2f513e5ce1189
parent 3eaa876cf317d064de1a32f1d34fd83b6e960e0b
parent ae73c6908ffd3c450d56a4fde95513cfff19d8a2
author John Spurlock <jspurlock@google.com> 1352234661 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352234661 -0800

am ae73c690: Fix regression in camera transition.

* commit 'ae73c6908ffd3c450d56a4fde95513cfff19d8a2':
  Fix regression in camera transition.