]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb82454 1adeaa3)
am 85eb3f0a: (-s ours) am 9694910e: am eed8d0b3: Fix for issue 9656 - custom xml...
authorinazaruk <ievgenii.nazaruk@gmail.com>
Fri, 24 Feb 2012 02:47:06 +0000 (18:47 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Feb 2012 02:47:06 +0000 (18:47 -0800)
* commit '85eb3f0af00aa35cceebbf162de4434418bf5a84':
  Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.


Trivial merge
mirror of aapt