am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev
* commit '919ce2051595dfa5dd047660946038d23fa688f4': Fix style warnings in RenderSessionImpl [DO NOT MERGE]
This commit is contained in: