OSDN Git Service

resolved conflicts for merge of 00d09649 to jb-mr1-dev
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 17:17:09 +0000 (10:17 -0700)
committerDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 17:17:09 +0000 (10:17 -0700)
commit673d9734c2d9b62ecd41dcac3c730d242952989e
treecb66515360ae3ed3708868c2148cac7df6908d2b
parent5280c911d81a7db5ec8854850bef60d8b0951358
parent00d096490189dadfc5e2a1e129d8b524d90da247
resolved conflicts for merge of 00d09649 to jb-mr1-dev

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