am 54aad953: am 4c2e3491: Merge "ActivityTransition: Encode scaleType and...
am 54aad953: am 4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev automerge: 63964d9e
* commit '54aad953':
ActivityTransition: Encode scaleType and matrix in snapshot view