OSDN Git Service

Fix incorrect merge conflict to klp-modular-dev-plus-aosp
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 16 Apr 2014 21:37:06 +0000 (14:37 -0700)
committerDeepanshu Gupta <deepanshu@google.com>
Wed, 16 Apr 2014 21:46:24 +0000 (14:46 -0700)
commitcf72f25981606b4e48130890f22f713d41e0d420
tree10a78840c7f5530732a2f7039ab90fa76e7a9202
parent3ee9dc58e5e1e39fac184b98cac0c7c46af72dd9
Fix incorrect merge conflict to klp-modular-dev-plus-aosp

resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp
properly, originally fixed in 35d46778f49c962c990cfc17e521aa80b9e0c016

Change-Id: I5d1abf641564ea19d283f60385d39f7670a2f22e
core/java/android/content/res/Resources.java