OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c94a531 9cee77b)
am 9cee77b3: am bebb2b54: am 7b734fd8: Merge "Allow multiple asset directories in...
authorAdam Lesinski <adamlesinski@google.com>
Fri, 21 Feb 2014 18:34:38 +0000 (10:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Feb 2014 18:34:38 +0000 (10:34 -0800)
* commit '9cee77b3704eaeee30b724590fe62ad5a8305339':
  Allow multiple asset directories in aapt


Trivial merge
build
About OSDN
Find Software
Develop Software
Help