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:
bc755da
a6b3caf
)
Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev
author
Michal Karpinski
<mkarpinski@google.com>
Thu, 13 Oct 2016 22:52:41 +0000
(22:52 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 13 Oct 2016 22:52:41 +0000
(22:52 +0000)
am:
a6b3caf58e
Change-Id: I9763e78b50a98dcf1139cdc299a8944e94c824d9
Trivial merge