summaryrefslogtreecommitdiffstats
path: root/wifi/java
diff options
context:
space:
mode:
authorJeremy Joslin <jjoslin@google.com>2014-12-08 19:36:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-08 19:36:27 +0000
commitd4753450f37d88fec11d1405250529ca794ae70c (patch)
tree29170e69ada86a560c5491f83e0086def5ba2952 /wifi/java
parent1b001caed3f2ee150850830dba371f13d61d5512 (diff)
parentc4b2ec1a3a808c2dae0894e5f0cfd43d6ec1d5a2 (diff)
downloadframeworks_base-d4753450f37d88fec11d1405250529ca794ae70c.zip
frameworks_base-d4753450f37d88fec11d1405250529ca794ae70c.tar.gz
frameworks_base-d4753450f37d88fec11d1405250529ca794ae70c.tar.bz2
am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev
* commit 'c4b2ec1a3a808c2dae0894e5f0cfd43d6ec1d5a2': Don't send the same PendingIntent more than once.
Diffstat (limited to 'wifi/java')
0 files changed, 0 insertions, 0 deletions