]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 717d31d dd854d4)
am fa5c7e1d: Catch when a file resource (non values) added in an overlay.
authorRobert Greenwalt <robdroid@android.com>
Mon, 8 Jun 2009 18:06:48 +0000 (11:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Jun 2009 18:06:48 +0000 (11:06 -0700)
Merge commit 'fa5c7e1dfede7e26260789dd2de5175497e9659b'

* commit 'fa5c7e1dfede7e26260789dd2de5175497e9659b':
  Catch when a file resource (non values) added in an overlay.

1  2 
Resource.cpp patch | diff1 | diff2 | blob | history

diff --cc Resource.cpp
Simple merge
mirror of aapt