]> git.saurik.com Git - android/aapt.git/commit
resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp
authorKenny Root <kroot@google.com>
Tue, 12 Apr 2011 17:27:15 +0000 (10:27 -0700)
committerKenny Root <kroot@google.com>
Tue, 12 Apr 2011 17:27:15 +0000 (10:27 -0700)
commit838914df8530468f5ce5e011a7049a9c48c81e54
treea02307f1cf510bae3d167878d840ce1d4ef014f5
parentd22c3a5df218c5ddfbc252faddde4e97666b2895
parentb1bccba13c57eb08858404e92ccd39041110da25
resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp

Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53
ResourceTable.cpp