OSDN Git Service

resolved conflicts for merge of 7377c7be to jb-mr1-dev
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 17:44:24 +0000 (10:44 -0700)
committerDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 17:44:24 +0000 (10:44 -0700)
commit0ad4f2cedde037c2b09a7f09c5f95f0984267c64
tree64ff61592be9775746522821ad4b6f30ea15aaed
parent5dae7fda38850a5146a6b8a4edbfd9aa96aea484
parent7377c7be6abcb3bccabb6cdf2af0ecfed355606c
resolved conflicts for merge of 7377c7be to jb-mr1-dev

Change-Id: I26d2e3478536826608413094e17cd36da43b4e23
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java