summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-11-01 18:48:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-01 18:48:00 +0000
commitb7824a9475d02bc3d96f1fb881a9769843e8f6f3 (patch)
treeb42821c5982b8f0d4c39e310d8212d92ad62f7d4 /wifi/java/android/net
parent91230fb31ce602a96f1575d5281722c2aef5558c (diff)
parent56d007b99841f7f603e5d5bc5c23b94c010f1945 (diff)
downloadframeworks_base-b7824a9475d02bc3d96f1fb881a9769843e8f6f3.zip
frameworks_base-b7824a9475d02bc3d96f1fb881a9769843e8f6f3.tar.gz
frameworks_base-b7824a9475d02bc3d96f1fb881a9769843e8f6f3.tar.bz2
Merge "Manage keyguard nav elements using transitions." into klp-dev
Diffstat (limited to 'wifi/java/android/net')
0 files changed, 0 insertions, 0 deletions