OSDN Git Service

resolved conflicts for merge of a663e012 to mnc-dev
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 7 May 2015 00:45:29 +0000 (17:45 -0700)
committerDeepanshu Gupta <deepanshu@google.com>
Thu, 7 May 2015 00:45:29 +0000 (17:45 -0700)
commit2ab7b460562ca9cf52a5c47a9c61a5cc31fd3a13
tree94d4294b7a4869641db814c32029f526ee8d3fb4
parentd7a53dab44babb38acc7cd0cc3067ae95152614d
parenta663e012049d5a159a7b51c072ffd413d7877426
resolved conflicts for merge of a663e012 to mnc-dev

Change-Id: I279cad7db6e9b5e97da3ea3c3bb91e09cabc7076
tools/layoutlib/bridge/src/android/view/BridgeInflater.java
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java