OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19753f4 bebb2b5)
am bebb2b54: am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp...
authorAdam Lesinski <adamlesinski@google.com>
Wed, 5 Feb 2014 00:56:13 +0000 (00:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 Feb 2014 00:56:13 +0000 (00:56 +0000)
* commit 'bebb2b54cee7a0fbf9419f6cc8659a8b16a37bd0':
  Allow multiple asset directories in aapt


Trivial merge
build
About OSDN
Find Software
Develop Software
Help