OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5f4eb0c
dd22aee
)
am dd22aee1: am 69c3f457: am dc7fee9f: Set up rules to merge AndroidManifest.xmls
author
Ying Wang
<wangying@google.com>
Fri, 21 Feb 2014 18:34:44 +0000
(10:34 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 21 Feb 2014 18:34:44 +0000
(10:34 -0800)
* commit '
dd22aee1f4e7acf935cc640fb5ec4fca8db721c1
':
Set up rules to merge AndroidManifest.xmls
Trivial merge