summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorIliyan Malchev <malchev@google.com>2012-08-20 15:01:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-20 15:01:44 -0700
commit904de8e4a9e206d8ebfc717703aa09f7381f45e2 (patch)
tree40843f1b4b947b2eb01b2da871d442cbe539d869 /api
parent427af58304123debe90d27631c05ae1e16842171 (diff)
parentc456bf13acbc4c0e7660705c1ab2b5acc5bc254c (diff)
downloadframeworks_base-904de8e4a9e206d8ebfc717703aa09f7381f45e2.zip
frameworks_base-904de8e4a9e206d8ebfc717703aa09f7381f45e2.tar.gz
frameworks_base-904de8e4a9e206d8ebfc717703aa09f7381f45e2.tar.bz2
am c456bf13: am 8756bd1d: Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev
* commit 'c456bf13acbc4c0e7660705c1ab2b5acc5bc254c': Revert "Revert "Add timestamp in scan results""
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 99bf378..fc84c80 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -13226,6 +13226,7 @@ package android.net.wifi {
field public java.lang.String capabilities;
field public int frequency;
field public int level;
+ field public long timestamp;
}
public final class SupplicantState extends java.lang.Enum implements android.os.Parcelable {