summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net/wifi/p2p
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2012-10-19 14:46:40 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-19 14:46:40 -0700
commit9823723d0f0bb47dfd3a6b251d7155dc1eb0918b (patch)
treed31b6fd9c9ac234ee1f4e6e781349f48b326d064 /wifi/java/android/net/wifi/p2p
parent935415a050be75f582f632dd168be9fbb047137b (diff)
parentff6c329f61ea4f00d9cbbe55387adbc2050f4679 (diff)
downloadframeworks_base-9823723d0f0bb47dfd3a6b251d7155dc1eb0918b.zip
frameworks_base-9823723d0f0bb47dfd3a6b251d7155dc1eb0918b.tar.gz
frameworks_base-9823723d0f0bb47dfd3a6b251d7155dc1eb0918b.tar.bz2
Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev
Diffstat (limited to 'wifi/java/android/net/wifi/p2p')
0 files changed, 0 insertions, 0 deletions