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