tree a50c65616df69f2e50e13826ced5cdac5ce51aff
parent cefe47c0d3471aedd4f7d4d3b5137a2a95161ad4
parent 3714473f1a077cae6eca3079da67a7dd09dcff65
author Jim Miller <jaggies@google.com> 1384381686 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384381686 -0800

am 3714473f: Merge "Enable fast camera transition when launched from navbar" into klp-dev

* commit '3714473f1a077cae6eca3079da67a7dd09dcff65':
  Enable fast camera transition when launched from navbar