OSDN Git Service

android-x86/frameworks-base.git
9 years agoam "am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto...
Vinit Deshpande [Sun, 15 Mar 2015 20:44:11 +0000 (13:44 -0700)]
am "am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
b0422a4 am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs

9 years agoam "am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revision...
Vinit Deshpande [Sun, 15 Mar 2015 20:44:10 +0000 (13:44 -0700)]
am "am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
709e9a8 am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs

9 years agoam "am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing...
Vinit Deshpande [Sun, 15 Mar 2015 20:44:09 +0000 (13:44 -0700)]
am "am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto""

merged from goog/mirror-m-wireless-internal-release
baf3451 am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"

9 years agoam "Helper methods for voicemail status provider."
Vinit Deshpande [Sun, 15 Mar 2015 20:44:07 +0000 (13:44 -0700)]
am "Helper methods for voicemail status provider."

merged from goog/mirror-m-wireless-internal-release
8b97ee3 Helper methods for voicemail status provider.

9 years agoam "Indicate local and remote RX/TX capabilities for VT."
Vinit Deshpande [Sun, 15 Mar 2015 20:44:05 +0000 (13:44 -0700)]
am "Indicate local and remote RX/TX capabilities for VT."

merged from goog/mirror-m-wireless-internal-release
5e9e8bb Indicate local and remote RX/TX capabilities for VT.

9 years agoam "Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc...
Vinit Deshpande [Sun, 15 Mar 2015 20:44:04 +0000 (13:44 -0700)]
am "Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev automerge: 8b438c8"

merged from goog/mirror-m-wireless-internal-release
4a2ca9d Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev automerge: 8b438c8

9 years agoam "Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc...
Vinit Deshpande [Sun, 15 Mar 2015 20:44:03 +0000 (13:44 -0700)]
am "Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev"

merged from goog/mirror-m-wireless-internal-release
8b438c8 Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev

9 years agoam "Add missing system-api.txt for RTT API changes"
Vinit Deshpande [Sun, 15 Mar 2015 20:44:01 +0000 (13:44 -0700)]
am "Add missing system-api.txt for RTT API changes"

merged from goog/mirror-m-wireless-internal-release
93e314e Add missing system-api.txt for RTT API changes

9 years agoam "am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev automerg...
Vinit Deshpande [Sun, 15 Mar 2015 20:44:00 +0000 (13:44 -0700)]
am "am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev automerge: 9462a93"

merged from goog/mirror-m-wireless-internal-release
1123a3e am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev automerge: 9462a93

9 years agoam "am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:59 +0000 (13:43 -0700)]
am "am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
9462a93 am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev

9 years agoam "Few changes to make API check happy [DO NOT MERGE]"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:58 +0000 (13:43 -0700)]
am "Few changes to make API check happy [DO NOT MERGE]"

merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed

9 years agoam "am "add 2 side RTT support on scan""
Vinit Deshpande [Sun, 15 Mar 2015 20:43:57 +0000 (13:43 -0700)]
am "am "add 2 side RTT support on scan""

merged from goog/mirror-m-wireless-internal-release
0019e53 am "add 2 side RTT support on scan"

9 years agoam "am "Merge "Do not provide 5GHz option for softap if there is no country code...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:55 +0000 (13:43 -0700)]
am "am "Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev""

merged from goog/mirror-m-wireless-internal-release
bc93466 am "Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev"

9 years agoam "am "Merge "Passpoint API - Take 1" into m-wireless-wifi-dev""
Vinit Deshpande [Sun, 15 Mar 2015 20:43:53 +0000 (13:43 -0700)]
am "am "Merge "Passpoint API - Take 1" into m-wireless-wifi-dev""

merged from goog/mirror-m-wireless-internal-release
4300ac4 am "Merge "Passpoint API - Take 1" into m-wireless-wifi-dev"

9 years agoam "am "Passpoint API - Take 1""
Vinit Deshpande [Sun, 15 Mar 2015 20:43:52 +0000 (13:43 -0700)]
am "am "Passpoint API - Take 1""

merged from goog/mirror-m-wireless-internal-release
d2585f3 am "Passpoint API - Take 1"

9 years agoam "am "Do not provide 5GHz option for softap if there is no country code available""
Vinit Deshpande [Sun, 15 Mar 2015 20:43:50 +0000 (13:43 -0700)]
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"

9 years agoam "am "Introduce onLost event on bssid hotlist [DO NOT MERGE]""
Vinit Deshpande [Sun, 15 Mar 2015 20:43:50 +0000 (13:43 -0700)]
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

9 years agoam "am "get channel list from driver for SoftAP channel selection""
Vinit Deshpande [Sun, 15 Mar 2015 20:43:48 +0000 (13:43 -0700)]
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"

9 years agoam "am "Revert "Initial Passpoint code."""
Vinit Deshpande [Sun, 15 Mar 2015 20:43:47 +0000 (13:43 -0700)]
am "am "Revert "Initial Passpoint code."""

merged from goog/mirror-m-wireless-internal-release
76f9ace am "Revert "Initial Passpoint code.""

9 years agoam "am "Initial Passpoint code.""
Vinit Deshpande [Sun, 15 Mar 2015 20:43:45 +0000 (13:43 -0700)]
am "am "Initial Passpoint code.""

merged from goog/mirror-m-wireless-internal-release
29267b6 am "Initial Passpoint code."

9 years agoam "am "Merge "set softAP on a specified band, including both 2.4 and 5 GHz band...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:43 +0000 (13:43 -0700)]
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"

9 years agoam "am "set softAP on a specified band, including both 2.4 and 5 GHz band""
Vinit Deshpande [Sun, 15 Mar 2015 20:43:42 +0000 (13:43 -0700)]
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"

9 years agoam "am "Bring in passpoint code [DO NOT MERGE]""
Vinit Deshpande [Sun, 15 Mar 2015 20:43:41 +0000 (13:43 -0700)]
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

9 years agoam "am "New Additions to WifiScanner APIs [DO NOT MERGE]""
Vinit Deshpande [Sun, 15 Mar 2015 20:43:40 +0000 (13:43 -0700)]
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

9 years agoam "Add strings for IMS Registration error notifications."
Vinit Deshpande [Sun, 15 Mar 2015 20:43:38 +0000 (13:43 -0700)]
am "Add strings for IMS Registration error notifications."

merged from goog/mirror-m-wireless-internal-release
36d96e0 Add strings for IMS Registration error notifications.

9 years agoam "am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:37 +0000 (13:43 -0700)]
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

9 years agoam "am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:36 +0000 (13:43 -0700)]
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

9 years agoam "am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:35 +0000 (13:43 -0700)]
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

9 years agoam "Update documentation of IImsConfig interface. automerge: 796d60b"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:34 +0000 (13:43 -0700)]
am "Update documentation of IImsConfig interface. automerge: 796d60b"

merged from goog/mirror-m-wireless-internal-release
b565b79 Update documentation of IImsConfig interface. automerge: 796d60b

9 years agoam "am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:33 +0000 (13:43 -0700)]
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

9 years agoam "Update documentation of IImsConfig interface."
Vinit Deshpande [Sun, 15 Mar 2015 20:43:32 +0000 (13:43 -0700)]
am "Update documentation of IImsConfig interface."

merged from goog/mirror-m-wireless-internal-release
796d60b Update documentation of IImsConfig interface.

9 years agoam "Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev autome...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:30 +0000 (13:43 -0700)]
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

9 years agoam "Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:29 +0000 (13:43 -0700)]
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

9 years agoam "IMS: Support for IMS Registration error codes"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:28 +0000 (13:43 -0700)]
am "IMS: Support for IMS Registration error codes"

merged from goog/mirror-m-wireless-internal-release
b54d218 IMS: Support for IMS Registration error codes

9 years agoam "am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:27 +0000 (13:43 -0700)]
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

9 years agoam "am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:26 +0000 (13:43 -0700)]
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

9 years agoam "am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos automerge:...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:25 +0000 (13:43 -0700)]
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

9 years agoam "am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:24 +0000 (13:43 -0700)]
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

9 years agoam "am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:23 +0000 (13:43 -0700)]
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

9 years agoam "am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:21 +0000 (13:43 -0700)]
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

9 years agoam "Merge "Hide calllog entries for unregistered phone accounts" into m-wireless...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:20 +0000 (13:43 -0700)]
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

9 years agoam "am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:19 +0000 (13:43 -0700)]
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

9 years agoam "Hide calllog entries for unregistered phone accounts"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:11 +0000 (13:43 -0700)]
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

9 years agoam "am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:51 +0000 (13:42 -0700)]
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

9 years agoam "am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:50 +0000 (13:42 -0700)]
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

9 years agoam "am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:49 +0000 (13:42 -0700)]
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

9 years agoam "Merge "Enable Ethernet if the device has FEATURE_USB_HOST." into m-wireless-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:48 +0000 (13:42 -0700)]
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

9 years agoam "am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:47 +0000 (13:42 -0700)]
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

9 years agoam "am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:46 +0000 (13:42 -0700)]
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

9 years agoam "Enable Ethernet if the device has FEATURE_USB_HOST."
Vinit Deshpande [Sun, 15 Mar 2015 20:42:44 +0000 (13:42 -0700)]
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.

9 years agoam "am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:43 +0000 (13:42 -0700)]
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

9 years agoam "am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:42 +0000 (13:42 -0700)]
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

9 years agoam "am 4eedcceb: Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:41 +0000 (13:42 -0700)]
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

9 years agoam "am 4eedcceb: Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:40 +0000 (13:42 -0700)]
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

9 years agoam "add 2 side RTT support on scan"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:38 +0000 (13:42 -0700)]
am "add 2 side RTT support on scan"

merged from goog/mirror-m-wireless-internal-release
6e58424 add 2 side RTT support on scan

9 years agoam "am c974ac11: MediaProjectionPermissionActivity: Fix NPE. automerge: d3c532e"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:37 +0000 (13:42 -0700)]
am "am c974ac11: MediaProjectionPermissionActivity: Fix NPE. automerge: d3c532e"

merged from goog/mirror-m-wireless-internal-release
73cb967 am c974ac11: MediaProjectionPermissionActivity: Fix NPE. automerge: d3c532e

9 years agoam "am c974ac11: MediaProjectionPermissionActivity: Fix NPE."
Vinit Deshpande [Sun, 15 Mar 2015 20:42:36 +0000 (13:42 -0700)]
am "am c974ac11: MediaProjectionPermissionActivity: Fix NPE."

merged from goog/mirror-m-wireless-internal-release
d3c532e am c974ac11: MediaProjectionPermissionActivity: Fix NPE.

9 years agoam "am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:35 +0000 (13:42 -0700)]
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

9 years agoam "am a81ed3cd: docs: support library updates for sdk 22 automerge: 7a3dc08"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:34 +0000 (13:42 -0700)]
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

9 years agoam "am e0ce0f2c: docs: platform revisions 5.1 automerge: 7de9d3b"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:33 +0000 (13:42 -0700)]
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

9 years agoam "am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:32 +0000 (13:42 -0700)]
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

9 years agoam "am 2ba57444: Merge "docs: update Android docs build to include API 22, Android...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:31 +0000 (13:42 -0700)]
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

9 years agoam "am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:30 +0000 (13:42 -0700)]
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

9 years agoam "am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:29 +0000 (13:42 -0700)]
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

9 years agoam "am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:28 +0000 (13:42 -0700)]
am "am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev automerge: 622c011"

merged from goog/mirror-m-wireless-internal-release
46d48f9 am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev automerge: 622c011

9 years agoam "am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:27 +0000 (13:42 -0700)]
am "am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
9a447bc am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

9 years agoam "am a81ed3cd: docs: support library updates for sdk 22"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:25 +0000 (13:42 -0700)]
am "am a81ed3cd: docs: support library updates for sdk 22"

merged from goog/mirror-m-wireless-internal-release
7a3dc08 am a81ed3cd: docs: support library updates for sdk 22

9 years agoam "am e0ce0f2c: docs: platform revisions 5.1"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:24 +0000 (13:42 -0700)]
am "am e0ce0f2c: docs: platform revisions 5.1"

merged from goog/mirror-m-wireless-internal-release
7de9d3b am e0ce0f2c: docs: platform revisions 5.1

9 years agoam "am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:23 +0000 (13:42 -0700)]
am "am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
a5587b9 am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev

9 years agoam "am 2ba57444: Merge "docs: update Android docs build to include API 22, Android...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:22 +0000 (13:42 -0700)]
am "am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
0a1d5ca am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev

9 years agoam "am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:21 +0000 (13:42 -0700)]
am "am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
b068c14 am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs

9 years agoam "am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:20 +0000 (13:42 -0700)]
am "am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
287f257 am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev

9 years agoam "am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:19 +0000 (13:42 -0700)]
am "am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
622c011 am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev

9 years agoam "Correct "Sign-in" and "Sign into" to "Sign in to"."
Vinit Deshpande [Sun, 15 Mar 2015 20:42:17 +0000 (13:42 -0700)]
am "Correct "Sign-in" and "Sign into" to "Sign in to"."

merged from goog/mirror-m-wireless-internal-release
44f7239 Correct "Sign-in" and "Sign into" to "Sign in to".

9 years agoam "Merge "Refactor NetworkUtils interaction with DHCP." into m-wireless-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:16 +0000 (13:42 -0700)]
am "Merge "Refactor NetworkUtils interaction with DHCP." into m-wireless-dev"

merged from goog/mirror-m-wireless-internal-release
46bdfa9 Merge "Refactor NetworkUtils interaction with DHCP." into m-wireless-dev

9 years agoam "am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:15 +0000 (13:42 -0700)]
am "am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev automerge: 4322c8d"

merged from goog/mirror-m-wireless-internal-release
335b59f am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev automerge: 4322c8d

9 years agoam "am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:14 +0000 (13:42 -0700)]
am "am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
4322c8d am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev

9 years agoam "am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:13 +0000 (13:42 -0700)]
am "am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev automerge: 2b24d07"

merged from goog/mirror-m-wireless-internal-release
969b027 am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev automerge: 2b24d07

9 years agoam "am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:12 +0000 (13:42 -0700)]
am "am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev automerge: 5e84b29"

merged from goog/mirror-m-wireless-internal-release
e99bef0 am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev automerge: 5e84b29

9 years agoam "am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:11 +0000 (13:42 -0700)]
am "am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev automerge: ab02793"

merged from goog/mirror-m-wireless-internal-release
b2c8848 am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev automerge: ab02793

9 years agoam "Update API."
Vinit Deshpande [Sun, 15 Mar 2015 20:42:02 +0000 (13:42 -0700)]
am "Update API."

merged from goog/mirror-m-wireless-internal-release
3ec7681 Update API.

Change-Id: Id4a08ee8e55cd4f5e8182a38d4855be80d452090

9 years agoam "Add frameworks classes and methods necessary for VVM syncadapter structure."
Vinit Deshpande [Sun, 15 Mar 2015 20:41:31 +0000 (13:41 -0700)]
am "Add frameworks classes and methods necessary for VVM syncadapter structure."

merged from goog/mirror-m-wireless-internal-release
7c07dfa Add frameworks classes and methods necessary for VVM syncadapter structure.

9 years agoam "Add PHONE_ACCOUNT_ADDRESS to the call log DB."
Vinit Deshpande [Sun, 15 Mar 2015 20:41:25 +0000 (13:41 -0700)]
am "Add PHONE_ACCOUNT_ADDRESS to the call log DB."

merged from goog/mirror-m-wireless-internal-release
204f80e Add PHONE_ACCOUNT_ADDRESS to the call log DB.

Change-Id: I363403bf73b202f03b3f706a823b0f142183a695

9 years agoam "Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB.""
Vinit Deshpande [Sun, 15 Mar 2015 20:41:14 +0000 (13:41 -0700)]
am "Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB.""

merged from goog/mirror-m-wireless-internal-release
da35a2b Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB."

Change-Id: I4dc4865d58e4b68858c7767f201e267a72dc236b

9 years agoam "Add PHONE_ACCOUNT_ADDRESS to the call log DB."
Vinit Deshpande [Sun, 15 Mar 2015 20:41:04 +0000 (13:41 -0700)]
am "Add PHONE_ACCOUNT_ADDRESS to the call log DB."

merged from goog/mirror-m-wireless-internal-release
40c6f2b Add PHONE_ACCOUNT_ADDRESS to the call log DB.

Change-Id: I91b487137a2da621b496bf5f135fe19bb0a6ca62

9 years agoam "Changed package name of a Telecom service"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:57 +0000 (13:40 -0700)]
am "Changed package name of a Telecom service"

merged from goog/mirror-m-wireless-internal-release
c4959ab Changed package name of a Telecom service

9 years agoam "Small update to PhoneAccountHandle ID javadoc."
Vinit Deshpande [Sun, 15 Mar 2015 20:40:55 +0000 (13:40 -0700)]
am "Small update to PhoneAccountHandle ID javadoc."

merged from goog/mirror-m-wireless-internal-release
b7bb8c4 Small update to PhoneAccountHandle ID javadoc.

9 years agoam "Merge "Add multi-SIM fields to VoicemailContract.Status." into m-wireless-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:54 +0000 (13:40 -0700)]
am "Merge "Add multi-SIM fields to VoicemailContract.Status." into m-wireless-dev"

merged from goog/mirror-m-wireless-internal-release
4eddc11 Merge "Add multi-SIM fields to VoicemailContract.Status." into m-wireless-dev

9 years agoam "Merge "Add Sub-ID-from-phone-account converter method." into m-wireless-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:53 +0000 (13:40 -0700)]
am "Merge "Add Sub-ID-from-phone-account converter method." into m-wireless-dev"

merged from goog/mirror-m-wireless-internal-release
e28ad78 Merge "Add Sub-ID-from-phone-account converter method." into m-wireless-dev

9 years agoam "Merge "Unhide and rename PhoneNumberUtils tts methods" into m-wireless-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:52 +0000 (13:40 -0700)]
am "Merge "Unhide and rename PhoneNumberUtils tts methods" into m-wireless-dev"

merged from goog/mirror-m-wireless-internal-release
bf443f9 Merge "Unhide and rename PhoneNumberUtils tts methods" into m-wireless-dev

9 years agoam "Merge "Unhide telecom APIs needed by Contacts" into m-wireless-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:51 +0000 (13:40 -0700)]
am "Merge "Unhide telecom APIs needed by Contacts" into m-wireless-dev"

merged from goog/mirror-m-wireless-internal-release
24ab1e4 Merge "Unhide telecom APIs needed by Contacts" into m-wireless-dev

9 years agoam "am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into...
Vinit Deshpande [Sun, 15 Mar 2015 20:40:50 +0000 (13:40 -0700)]
am "am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev"

merged from goog/mirror-m-wireless-internal-release
2b24d07 am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev

9 years agoam "am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements...
Vinit Deshpande [Sun, 15 Mar 2015 20:40:49 +0000 (13:40 -0700)]
am "am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev"

merged from goog/mirror-m-wireless-internal-release
5e84b29 am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev

9 years agoam "am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList...
Vinit Deshpande [Sun, 15 Mar 2015 20:40:48 +0000 (13:40 -0700)]
am "am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev"

merged from goog/mirror-m-wireless-internal-release
ab02793 am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev

9 years agoam "am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:47 +0000 (13:40 -0700)]
am "am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
c92fa1f am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev

9 years agoam "Add multi-SIM fields to VoicemailContract.Status."
Vinit Deshpande [Sun, 15 Mar 2015 20:40:45 +0000 (13:40 -0700)]
am "Add multi-SIM fields to VoicemailContract.Status."

merged from goog/mirror-m-wireless-internal-release
109dabd Add multi-SIM fields to VoicemailContract.Status.

9 years agoam "Add Sub-ID-from-phone-account converter method."
Vinit Deshpande [Sun, 15 Mar 2015 20:40:43 +0000 (13:40 -0700)]
am "Add Sub-ID-from-phone-account converter method."

merged from goog/mirror-m-wireless-internal-release
9b09c15 Add Sub-ID-from-phone-account converter method.

9 years agoam "am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard...
Vinit Deshpande [Sun, 15 Mar 2015 20:40:42 +0000 (13:40 -0700)]
am "am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update"

merged from goog/mirror-m-wireless-internal-release
d186768 am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update

9 years agoam "Unhide and rename PhoneNumberUtils tts methods"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:36 +0000 (13:40 -0700)]
am "Unhide and rename PhoneNumberUtils tts methods"

merged from goog/mirror-m-wireless-internal-release
57f8f0d Unhide and rename PhoneNumberUtils tts methods

Change-Id: I72ddd3c38b69a7354564e5d1a1ae2d20330f6f2b

9 years agoam "Unhide telecom APIs needed by Contacts"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:28 +0000 (13:40 -0700)]
am "Unhide telecom APIs needed by Contacts"

merged from goog/mirror-m-wireless-internal-release
48d8442 Unhide telecom APIs needed by Contacts