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:
c32b08d
ae54fae
)
Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev am...
author
Suprabh Shukla
<suprabh@google.com>
Tue, 16 Aug 2016 00:56:47 +0000
(
00:56
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 16 Aug 2016 00:56:47 +0000
(
00:56
+0000)
am:
ae54fae453
Change-Id: I9919c3614d5b757ab1bb84568eb836e4d7d3d0a5
Trivial merge