185174 Commits

Author SHA1 Message Date
Vinit Deshpande
bc4a627b4d am "am "Passpoint API - Take 1""
merged from goog/mirror-m-wireless-internal-release
d2585f3 am "Passpoint API - Take 1"
2015-03-15 13:43:52 -07:00
Vinit Deshpande
c72607beca am "am "Do not provide 5GHz option for softap if there is no country code available""
merged from goog/mirror-m-wireless-internal-release
e959443 am "Do not provide 5GHz option for softap if there is no country code available"
2015-03-15 13:43:50 -07:00
Vinit Deshpande
8fe414d3fc am "am "Introduce onLost event on bssid hotlist [DO NOT MERGE]""
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
2015-03-15 13:43:50 -07:00
Vinit Deshpande
ba8c391027 am "am "get channel list from driver for SoftAP channel selection""
merged from goog/mirror-m-wireless-internal-release
3cb5e4d am "get channel list from driver for SoftAP channel selection"
2015-03-15 13:43:48 -07:00
Vinit Deshpande
2130a16b32 am "am "Revert "Initial Passpoint code."""
merged from goog/mirror-m-wireless-internal-release
76f9ace am "Revert "Initial Passpoint code.""
2015-03-15 13:43:47 -07:00
Vinit Deshpande
a32db201a8 am "am "Initial Passpoint code.""
merged from goog/mirror-m-wireless-internal-release
29267b6 am "Initial Passpoint code."
2015-03-15 13:43:45 -07:00
Vinit Deshpande
5865b6aceb am "am "Merge "set softAP on a specified band, including both 2.4 and 5 GHz band" into m-wireless-wifi-dev""
merged from goog/mirror-m-wireless-internal-release
f0bfa91 am "Merge "set softAP on a specified band, including both 2.4 and 5 GHz band" into m-wireless-wifi-dev"
2015-03-15 13:43:43 -07:00
Vinit Deshpande
535fb0189a am "am "set softAP on a specified band, including both 2.4 and 5 GHz band""
merged from goog/mirror-m-wireless-internal-release
b4499af am "set softAP on a specified band, including both 2.4 and 5 GHz band"
2015-03-15 13:43:42 -07:00
Vinit Deshpande
bf44807438 am "am "Bring in passpoint code [DO NOT MERGE]""
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
2015-03-15 13:43:41 -07:00
Vinit Deshpande
65c1c2ceed am "am "New Additions to WifiScanner APIs [DO NOT MERGE]""
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
2015-03-15 13:43:40 -07:00
Vinit Deshpande
1949b805fa am "Add strings for IMS Registration error notifications."
merged from goog/mirror-m-wireless-internal-release
36d96e0 Add strings for IMS Registration error notifications.
2015-03-15 13:43:38 -07:00
Vinit Deshpande
a77f84f341 am "am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs automerge: 011f5ce"
merged from goog/mirror-m-wireless-internal-release
81e1b71 am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs automerge: 011f5ce
2015-03-15 13:43:37 -07:00
Vinit Deshpande
5664f6e05f am "am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
011f5ce am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
2015-03-15 13:43:36 -07:00
Vinit Deshpande
8e212d6aae am "am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs automerge: 142e90e"
merged from goog/mirror-m-wireless-internal-release
e6dc1a9 am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs automerge: 142e90e
2015-03-15 13:43:35 -07:00
Vinit Deshpande
13828e71d7 am "Update documentation of IImsConfig interface. automerge: 796d60b"
merged from goog/mirror-m-wireless-internal-release
b565b79 Update documentation of IImsConfig interface. automerge: 796d60b
2015-03-15 13:43:34 -07:00
Vinit Deshpande
549012c28b am "am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
142e90e am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
2015-03-15 13:43:33 -07:00
Vinit Deshpande
a7d8aa7729 am "Update documentation of IImsConfig interface."
merged from goog/mirror-m-wireless-internal-release
796d60b Update documentation of IImsConfig interface.
2015-03-15 13:43:32 -07:00
Vinit Deshpande
5b2e7313ea am "Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev automerge: 2f23212"
merged from goog/mirror-m-wireless-internal-release
6c70b49 Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev automerge: 2f23212
2015-03-15 13:43:30 -07:00
Vinit Deshpande
303c90e146 am "Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev"
merged from goog/mirror-m-wireless-internal-release
2f23212 Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev
2015-03-15 13:43:29 -07:00
Vinit Deshpande
7dab6b29eb am "IMS: Support for IMS Registration error codes"
merged from goog/mirror-m-wireless-internal-release
b54d218 IMS: Support for IMS Registration error codes
2015-03-15 13:43:28 -07:00
Vinit Deshpande
766686f336 am "am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs automerge: df5651d"
merged from goog/mirror-m-wireless-internal-release
e4112b7 am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs automerge: df5651d
2015-03-15 13:43:27 -07:00
Vinit Deshpande
07e1cf216a am "am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
df5651d am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs
2015-03-15 13:43:26 -07:00
Vinit Deshpande
4ccdf42363 am "am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos automerge: 32ee913"
merged from goog/mirror-m-wireless-internal-release
2f4f522 am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos automerge: 32ee913
2015-03-15 13:43:25 -07:00
Vinit Deshpande
95d4320ea1 am "am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos"
merged from goog/mirror-m-wireless-internal-release
32ee913 am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos
2015-03-15 13:43:24 -07:00
Vinit Deshpande
655ef766b2 am "am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev automerge: 701d816"
merged from goog/mirror-m-wireless-internal-release
2a23382 am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev automerge: 701d816
2015-03-15 13:43:23 -07:00
Vinit Deshpande
a8b8a3a16b am "am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
701d816 am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
2015-03-15 13:43:21 -07:00
Vinit Deshpande
4496c88f0e am "Merge "Hide calllog entries for unregistered phone accounts" into m-wireless-dev"
merged from goog/mirror-m-wireless-internal-release
ddbf13d Merge "Hide calllog entries for unregistered phone accounts" into m-wireless-dev
2015-03-15 13:43:20 -07:00
Vinit Deshpande
2270862d10 am "am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs automerge: ac35ad3"
merged from goog/mirror-m-wireless-internal-release
5bd0d33 am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs automerge: ac35ad3
2015-03-15 13:43:19 -07:00
Vinit Deshpande
a4985a7952 am "Hide calllog entries for unregistered phone accounts"
merged from goog/mirror-m-wireless-internal-release
2d2bc16 Hide calllog entries for unregistered phone accounts

Change-Id: I39b60b86fca9c1b74d750ab251cc26b3ce5f5650
2015-03-15 13:43:11 -07:00
Vinit Deshpande
a166fa09c8 am "am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
ac35ad3 am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
2015-03-15 13:42:51 -07:00
Vinit Deshpande
9b2eb2b0f7 am "am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix automerge: 06a22af"
merged from goog/mirror-m-wireless-internal-release
9674014 am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix automerge: 06a22af
2015-03-15 13:42:50 -07:00
Vinit Deshpande
c39511f405 am "am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix"
merged from goog/mirror-m-wireless-internal-release
06a22af am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix
2015-03-15 13:42:49 -07:00
Vinit Deshpande
fa8d5cbe14 am "Merge "Enable Ethernet if the device has FEATURE_USB_HOST." into m-wireless-dev"
merged from goog/mirror-m-wireless-internal-release
1c55b90 Merge "Enable Ethernet if the device has FEATURE_USB_HOST." into m-wireless-dev
2015-03-15 13:42:48 -07:00
Vinit Deshpande
f14de2e602 am "am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs automerge: ee314cf"
merged from goog/mirror-m-wireless-internal-release
bb33ce8 am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs automerge: ee314cf
2015-03-15 13:42:47 -07:00
Vinit Deshpande
c377b6c2e5 am "am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
ee314cf am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
2015-03-15 13:42:46 -07:00
Vinit Deshpande
ee56e254bd am "Enable Ethernet if the device has FEATURE_USB_HOST."
merged from goog/mirror-m-wireless-internal-release
f4f93b2 Enable Ethernet if the device has FEATURE_USB_HOST.
2015-03-15 13:42:44 -07:00
Vinit Deshpande
871ad7aad6 am "am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs automerge: 5890742"
merged from goog/mirror-m-wireless-internal-release
6657dd3 am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs automerge: 5890742
2015-03-15 13:42:43 -07:00
Vinit Deshpande
5109a6138d am "am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
5890742 am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
2015-03-15 13:42:42 -07:00
Vinit Deshpande
621a86c156 am "am 4eedcceb: Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev automerge: 3797ee9"
merged from goog/mirror-m-wireless-internal-release
7ddec30 am 4eedcceb: Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev automerge: 3797ee9
2015-03-15 13:42:41 -07:00
Vinit Deshpande
f17e886554 am "am 4eedcceb: Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
3797ee9 am 4eedcceb: Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev
2015-03-15 13:42:40 -07:00
Vinit Deshpande
fd67bf63e6 am "add 2 side RTT support on scan"
merged from goog/mirror-m-wireless-internal-release
6e58424 add 2 side RTT support on scan
2015-03-15 13:42:38 -07:00
Vinit Deshpande
503bdb519e am "am c974ac11: MediaProjectionPermissionActivity: Fix NPE. automerge: d3c532e"
merged from goog/mirror-m-wireless-internal-release
73cb967 am c974ac11: MediaProjectionPermissionActivity: Fix NPE. automerge: d3c532e
2015-03-15 13:42:37 -07:00
Vinit Deshpande
0772daa362 am "am c974ac11: MediaProjectionPermissionActivity: Fix NPE."
merged from goog/mirror-m-wireless-internal-release
d3c532e am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
2015-03-15 13:42:36 -07:00
Vinit Deshpande
0f8fb7a02b am "am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs automerge: 9a447bc"
merged from goog/mirror-m-wireless-internal-release
2782f31 am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs automerge: 9a447bc
2015-03-15 13:42:35 -07:00
Vinit Deshpande
c0aa1019af am "am a81ed3cd: docs: support library updates for sdk 22 automerge: 7a3dc08"
merged from goog/mirror-m-wireless-internal-release
2444690 am a81ed3cd: docs: support library updates for sdk 22 automerge: 7a3dc08
2015-03-15 13:42:34 -07:00
Vinit Deshpande
2334a447e8 am "am e0ce0f2c: docs: platform revisions 5.1 automerge: 7de9d3b"
merged from goog/mirror-m-wireless-internal-release
c3b5768 am e0ce0f2c: docs: platform revisions 5.1 automerge: 7de9d3b
2015-03-15 13:42:33 -07:00
Vinit Deshpande
41372bbe81 am "am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev automerge: a5587b9"
merged from goog/mirror-m-wireless-internal-release
63751cf am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev automerge: a5587b9
2015-03-15 13:42:32 -07:00
Vinit Deshpande
ee1ef0ad14 am "am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev automerge: 0a1d5ca"
merged from goog/mirror-m-wireless-internal-release
91572ab am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev automerge: 0a1d5ca
2015-03-15 13:42:31 -07:00
Vinit Deshpande
9470f17ebb am "am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs automerge: b068c14"
merged from goog/mirror-m-wireless-internal-release
0764a8b am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs automerge: b068c14
2015-03-15 13:42:30 -07:00
Vinit Deshpande
b7899e477b am "am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev automerge: 287f257"
merged from goog/mirror-m-wireless-internal-release
6e3276c am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev automerge: 287f257
2015-03-15 13:42:29 -07:00