tree 8fe0d234dd5b2bb31f7b9460e535a2b5f672eb59
parent 883a17cd954c31fb7742fb415e3949623e81ba6b
parent 0573cffacc4a7247151aae62d176a9e947e1dabe
author Deepanshu Gupta <deepanshu@google.com> 1400016490 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400016490 +0000

am 0573cffa: am b520cc45: am cf2af661: am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev

* commit '0573cffacc4a7247151aae62d176a9e947e1dabe':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]