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:
fb5c7e5
1d671c2
)
am 1d671c23: am 823f0ba6: (-s ours) am 0239220a: am 2f5de9f5: Merge "Bring main.mk...
author
Narayan Kamath
<narayan@google.com>
Wed, 2 Apr 2014 11:08:59 +0000
(11:08 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 2 Apr 2014 11:08:59 +0000
(11:08 +0000)
* commit '
1d671c236ab7018c2534f7a4e0a0c7fe62bf53b6
':
Bring main.mk in sync with master.
Trivial merge