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:
bf401dd
898b9e4
)
am 898b9e43: resolve conflicts w/aaf823d2
author
Ed Heyl
<edheyl@google.com>
Mon, 8 Dec 2014 20:28:41 +0000
(20:28 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 8 Dec 2014 20:28:41 +0000
(20:28 +0000)
* commit '
898b9e43cfc275acf727b748c191877349a78d98
':
Fix issue #
18368417
: 5.0 -> 5.1.
Trivial merge