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:
8dd5203
1f45f29
)
Merge "Fix getWifiManager exception if phone is encrypted"
author
Ye Jiao
<ye.jiao@mediatek.com>
Fri, 29 Mar 2019 20:15:14 +0000
(13:15 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 29 Mar 2019 20:15:14 +0000
(13:15 -0700)
am:
1f45f29d18
Change-Id: I47d47742083f38367fec31850db9d0e7fc9b3c13
Trivial merge