OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
370da72
a001da3
)
am c205a9d6: am f8aea993: Make aapt ignore tools-related data.
author
Xavier Ducrohet
<xav@android.com>
Mon, 6 Feb 2012 19:42:50 +0000
(11:42 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 6 Feb 2012 19:42:50 +0000
(11:42 -0800)
* commit '
c205a9d68c23e9ade2cbe28bba0f257d84d23a97
':
Make aapt ignore tools-related data.
Trivial merge