OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1441acd 203356a)
am 203356a3: Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev
authorAdam Lesinski <adamlesinski@google.com>
Tue, 4 Feb 2014 18:36:10 +0000 (18:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Feb 2014 18:36:10 +0000 (18:36 +0000)
* commit '203356a34a82bfc759be02dfa1caa4529dce0732':
  Add support for multiple asset dirs (-A)

1  2 
tools/aapt/AaptAssets.cpp patch | diff1 | diff2 | blob | history

diff --cc tools/aapt/AaptAssets.cpp
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help