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