tree 1629b381d37037c68755d90861a8b41d13113a58
parent 14480abeb6642d7b779d50f03e5340356a4e4b2b
parent b520cc45996de4a172147d4e934768ec6c417666
author Deepanshu Gupta <deepanshu@google.com> 1400016215 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400016215 +0000

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 'b520cc45996de4a172147d4e934768ec6c417666':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]