OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7b22c14
f713aa2
)
am f713aa2f: Merge "AAPT2: Include package name of attributes in styleable from anoth...
author
Adam Lesinski
<adamlesinski@google.com>
Tue, 12 May 2015 21:07:22 +0000
(21:07 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 12 May 2015 21:07:22 +0000
(21:07 +0000)
* commit '
f713aa2f10ea01fab302536a87bd0521b915cb05
':
AAPT2: Include package name of attributes in styleable from another package
Trivial merge