]> git.saurik.com Git - android/aapt.git/commit
resolved conflicts for merge of 10d5b096 to master
authorDianne Hackborn <hackbod@google.com>
Mon, 4 Oct 2010 21:54:59 +0000 (14:54 -0700)
committerDianne Hackborn <hackbod@google.com>
Mon, 4 Oct 2010 21:54:59 +0000 (14:54 -0700)
commit440fcf2cb765ff99ccc9ccbc1afb9de1a698e2bb
treeaead7abf1375436b7c1ebcd3423680d02392d6c7
parent19d44c3efab1f054eefda13f888e2b9cdc536c86
parent5ff0db49462408ce096cd42b517dd8399c8f5479
resolved conflicts for merge of 10d5b096 to master

Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7
ResourceTable.cpp