tree 80a3b4c13ba476ff76c868ae4d709c3280b7422d
parent 9f5f450dca41bcea94b2abae1c782a84c0387f6d
parent 919ce2051595dfa5dd047660946038d23fa688f4
author Deepanshu Gupta <deepanshu@google.com> 1400015248 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400015248 +0000

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]