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:
9143a24
c217d7b
)
am c217d7b7: am 6099a84f: am 2521d0d2: am 5a4183f3: am 267afcde: Merge "HACK: disable...
author
Greg Hackmann
<ghackmann@google.com>
Tue, 18 Mar 2014 21:01:17 +0000
(14:01 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 18 Mar 2014 21:01:17 +0000
(14:01 -0700)
* commit '
c217d7b7c1aa1ec553c6bb97b7534df0aa20433e
':
HACK: disable emulator on x86_64
Trivial merge