summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/SearchDialog.java
diff options
context:
space:
mode:
authorPaul Jensen <pauljensen@google.com>2015-09-23 11:33:13 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-23 11:33:13 +0000
commit554cecea4c5e39c25efb721258366ce12e6b861c (patch)
treee87584f7a28010b1a1e0cc5930bd5959a5239c7c /core/java/android/app/SearchDialog.java
parent3e344f3fcb66f3e94a3b5436d5901dec0b94cbb3 (diff)
parent10a7d7449dae2aabf4f22f980e7efabf274a939a (diff)
downloadframeworks_base-554cecea4c5e39c25efb721258366ce12e6b861c.zip
frameworks_base-554cecea4c5e39c25efb721258366ce12e6b861c.tar.gz
frameworks_base-554cecea4c5e39c25efb721258366ce12e6b861c.tar.bz2
am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '10a7d7449dae2aabf4f22f980e7efabf274a939a': Fix NOT_RESTRICTED network capability and enforce it.
Diffstat (limited to 'core/java/android/app/SearchDialog.java')
0 files changed, 0 insertions, 0 deletions