]> git.saurik.com Git - android/aapt.git/commit
resolved conflicts for merge of 18490fb9 to master
authorKenny Root <kroot@google.com>
Tue, 12 Apr 2011 19:51:08 +0000 (12:51 -0700)
committerKenny Root <kroot@google.com>
Tue, 12 Apr 2011 19:51:08 +0000 (12:51 -0700)
commita9115c86cf3440b2b6ee37f47da6f56bf5f859c6
treed08e29fcff1d6662af9267230993d45120b9049e
parenta330e7e3aa5e0a1ee03b048106d272e5d544bbe0
parent838914df8530468f5ce5e011a7049a9c48c81e54
resolved conflicts for merge of 18490fb9 to master

Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37
ResourceTable.cpp