OSDN Git Service

am b520cc45: am cf2af661: am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 21:23:35 +0000 (21:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 21:23:35 +0000 (21:23 +0000)
commit0573cffacc4a7247151aae62d176a9e947e1dabe
tree1629b381d37037c68755d90861a8b41d13113a58
parent14480abeb6642d7b779d50f03e5340356a4e4b2b
parentb520cc45996de4a172147d4e934768ec6c417666
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]