summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-05-22 21:38:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-22 21:38:24 +0000
commitfab334081eee36d6d75fc19cf686ca9e20246c16 (patch)
tree4fe24e64700af133b1bc32fc3f7d367cf2afe7fb /wifi/java/android/net
parentd02ec5989dd93df1d6ab45ad9f280730553f11e6 (diff)
parentc5d8fbcd2eb78b909f2282b9924992babd198b00 (diff)
downloadframeworks_base-fab334081eee36d6d75fc19cf686ca9e20246c16.zip
frameworks_base-fab334081eee36d6d75fc19cf686ca9e20246c16.tar.gz
frameworks_base-fab334081eee36d6d75fc19cf686ca9e20246c16.tar.bz2
Merge "No longer trigger immersive cling on panic" into mnc-dev
Diffstat (limited to 'wifi/java/android/net')
0 files changed, 0 insertions, 0 deletions