OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
56542a3
648d303
)
Merge \"Fix timeout in a test utility method\" into nyc-mr1-dev
author
Makoto Onuki
<omakoto@google.com>
Thu, 28 Jul 2016 17:48:41 +0000
(17:48 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 28 Jul 2016 17:48:41 +0000
(17:48 +0000)
am:
648d3030a7
Change-Id: I0dc46ba4967e3094f9d08aa490a70ae94efa3263
Trivial merge