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:
1bd53e5
2521d0d
)
am 2521d0d2: am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"
author
Greg Hackmann
<ghackmann@google.com>
Tue, 18 Mar 2014 19:33:35 +0000
(19:33 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 18 Mar 2014 19:33:35 +0000
(19:33 +0000)
* commit '
2521d0d23a151c8689125dc119d80fa86a52dbfb
':
HACK: disable emulator on x86_64
Trivial merge