OSDN Git Service
(root)
/
android-x86
/
device-generic-goldfish.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4deb9fb
9f751f6
)
Merge "Allow emulator goldfish-setup to take wake locks" am: d1dad67cd7
author
Lingfeng Yang
<lfy@google.com>
Fri, 6 Jan 2017 20:07:11 +0000
(20:07 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 6 Jan 2017 20:07:11 +0000
(20:07 +0000)
am:
9f751f6eab
Change-Id: I9dfe23339ba1e57709395b07e81b85e3d47b4fc9
Trivial merge