am ccbda3b2: am ee6eedec: Merge "Undo inadvertent change to Transitions API demo."

* commit 'ccbda3b2fb06893d0ad8af67a78649f2697b283f':
This commit is contained in:
George Mount
2014-05-13 15:19:14 +00:00
committed by Android Git Automerger

Diff Content Not Available