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:
736cb0e
fdb3d31
)
Merge "Add timeout to StrictMode flash." into oc-dev
author
Jeff Sharkey
<jsharkey@google.com>
Thu, 8 Jun 2017 00:36:09 +0000
(
00:36
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 8 Jun 2017 00:36:09 +0000
(
00:36
+0000)
am:
fdb3d31504
Change-Id: I13684a6c952e978eed035e8c217605469c3b8665
Trivial merge