OSDN Git Service

resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 16 Apr 2014 19:14:34 +0000 (12:14 -0700)
committerDeepanshu Gupta <deepanshu@google.com>
Wed, 16 Apr 2014 19:14:34 +0000 (12:14 -0700)
commit35d46778f49c962c990cfc17e521aa80b9e0c016
tree41c3a387058ad08b241a92d83a348276c11c5f78
parent82d5f137ed03dcd1020fb554a1d0f3029a826282
parentec6676ddf682e22dfb56aa54359c9480dfa661d3
resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp

Change-Id: I2fec735ba65f56da7d17022074f8924a259b4bbf
core/java/android/content/res/Resources.java
tools/layoutlib/bridge/src/android/content/res/AssetManager_Delegate.java