tree 05dea0b0ae6e270a743645a5cef796290657c850
parent 057dca97d9a486b94c82673a95a7a3933bca9a4d
parent 7406e4b8102ffd71affd55a9f453c0ecce13a097
author Deepanshu Gupta <deepanshu@google.com> 1398303382 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398303382 +0000

am 7406e4b8: am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev

* commit '7406e4b8102ffd71affd55a9f453c0ecce13a097':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]