OSDN Git Service
Deepanshu Gupta [Thu, 12 Mar 2015 02:05:06 +0000 (02:05 +0000)]
am
c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
automerge:
713e7cc
* commit '
713e7cc8c04a3486c99ad8c5af1adfd877f59798':
Tools attribute improvements for RecyclerView LayoutManager.
Rich Slogar [Thu, 12 Mar 2015 02:04:57 +0000 (02:04 +0000)]
am
0146922a: am
633f4829: am
7256fb4f: am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs
automerge:
3a5a410
* commit '
3a5a410bca766aa7d48a6538df02e692ac693035':
docs: build image updates
Deepanshu Gupta [Thu, 12 Mar 2015 01:45:25 +0000 (01:45 +0000)]
am
c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
* commit '
c44430a36813dc4afb6000279254e578bc5d0391':
Tools attribute improvements for RecyclerView LayoutManager.
Deepanshu Gupta [Thu, 12 Mar 2015 01:16:44 +0000 (01:16 +0000)]
Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 01:03:46 +0000 (01:03 +0000)]
am
71ba1230: am
efc09c64: am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
automerge:
5c69ca2
* commit '
5c69ca2b6d9e33fa84c78355d68215d88c6f23b2':
Fix cyclic dependency in BlendComposite and BlendingMode.
Deepanshu Gupta [Thu, 12 Mar 2015 01:03:39 +0000 (01:03 +0000)]
am
b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
automerge:
49d3c36
* commit '
49d3c36134f818e06dc6c71d462ee8369c73c195':
Fix rare NPE in BridgeContext.
Deepanshu Gupta [Thu, 12 Mar 2015 01:03:31 +0000 (01:03 +0000)]
am
71518174: Merge "Fix project settings." into lmp-mr1-dev
automerge:
4abf088
* commit '
4abf0885d7411e92ea0345686781e663a00fc1ba':
Fix project settings.
Deepanshu Gupta [Thu, 12 Mar 2015 01:03:23 +0000 (01:03 +0000)]
am
b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
automerge:
26f672a
* commit '
26f672a94cdc7cf8ff04745cc1a42b0e2acdf9e4':
Add RecyclerView support.
Rich Slogar [Thu, 12 Mar 2015 00:59:36 +0000 (00:59 +0000)]
am
0146922a: am
633f4829: am
7256fb4f: am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs
* commit '
0146922a6fee8af01ffd6ea201cbb6de0dbd4ed8':
docs: build image updates
Deepanshu Gupta [Thu, 12 Mar 2015 00:53:12 +0000 (00:53 +0000)]
am
71ba1230: am
efc09c64: am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit '
71ba12308e338595d8068ff788bb5c8abfcfe515':
Fix cyclic dependency in BlendComposite and BlendingMode.
Rich Slogar [Thu, 12 Mar 2015 00:52:49 +0000 (00:52 +0000)]
am
633f4829: am
7256fb4f: am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs
* commit '
633f482907d6c9cce672341f0d0a4d6c5c2b7f78':
docs: build image updates
Quddus Chong [Thu, 12 Mar 2015 00:51:43 +0000 (00:51 +0000)]
am
77eb85e1: am
c706a980: am
a236a49e: am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
automerge:
766889e
* commit '
766889e9e27256c5772ee9f0eabe80444e9586d4':
docs: Added overview page and Javadocs for the Android Testing Support Library.
Deepanshu Gupta [Thu, 12 Mar 2015 00:46:14 +0000 (00:46 +0000)]
am
b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
* commit '
b3cfb334893a0b302cd6a0a998f27ca2e8ba7f9d':
Fix rare NPE in BridgeContext.
Deepanshu Gupta [Thu, 12 Mar 2015 00:46:10 +0000 (00:46 +0000)]
am
71518174: Merge "Fix project settings." into lmp-mr1-dev
* commit '
71518174fcd57c85d1e38f1794c44b763baff286':
Fix project settings.
Deepanshu Gupta [Thu, 12 Mar 2015 00:46:07 +0000 (00:46 +0000)]
am
b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
* commit '
b171be1a54a6a0fe416916ff91e41362b8bb4873':
Add RecyclerView support.
Deepanshu Gupta [Thu, 12 Mar 2015 00:45:40 +0000 (00:45 +0000)]
am
efc09c64: am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit '
efc09c644fa4e8354d54485aab6c0b18868284eb':
Fix cyclic dependency in BlendComposite and BlendingMode.
Rich Slogar [Thu, 12 Mar 2015 00:45:40 +0000 (00:45 +0000)]
am
7256fb4f: am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs
* commit '
7256fb4fdd088cd0a827452cbdd8bd243da00881':
docs: build image updates
Quddus Chong [Thu, 12 Mar 2015 00:41:08 +0000 (00:41 +0000)]
am
77eb85e1: am
c706a980: am
a236a49e: am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
* commit '
77eb85e14fb37a67af2eaf120e1c866dee64ad2c':
docs: Added overview page and Javadocs for the Android Testing Support Library.
Deepanshu Gupta [Thu, 12 Mar 2015 00:38:45 +0000 (00:38 +0000)]
am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit '
78660423900fa255cc83b85320e98d5184be393b':
Fix cyclic dependency in BlendComposite and BlendingMode.
Rich Slogar [Thu, 12 Mar 2015 00:38:38 +0000 (00:38 +0000)]
am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs
* commit '
a6b0ddb7f1437d67538364f16dedb61f7966c653':
docs: build image updates
Rich Slogar [Thu, 12 Mar 2015 00:34:09 +0000 (00:34 +0000)]
Merge "docs: build image updates" into lmp-docs
Deepanshu Gupta [Thu, 12 Mar 2015 00:32:45 +0000 (00:32 +0000)]
Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:32:22 +0000 (00:32 +0000)]
Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:31:52 +0000 (00:31 +0000)]
Merge "Fix project settings." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:31:49 +0000 (00:31 +0000)]
Merge "Add RecyclerView support." into lmp-mr1-dev
Deepanshu Gupta [Wed, 11 Mar 2015 23:48:20 +0000 (16:48 -0700)]
Tools attribute improvements for RecyclerView LayoutManager.
1. Change tools attribute for layout manager from layoutManagerType to
LayoutManager.
2. Support classnames in the tools attribute.
This change doesn't try to supprt arbitrary classnames for now. The
reason for this is that the new layoutlib API is supposed to contain a
new method for inflating custom classes that are not views. This will
allow us to throw better error messages. Without the new API, trying for
different constructors, will result in a error messages being logged.
Change-Id: I3a31359c06b7452bfd973c3e5e54f9038acccfaa
Deepanshu Gupta [Wed, 11 Mar 2015 23:34:13 +0000 (16:34 -0700)]
Fix cyclic dependency in BlendComposite and BlendingMode.
Introduced in commit
1a10ca7e526736b4fd143f7c9f3b29643c0062a4
Bug: http://b.android.com/159708
Change-Id: I6add5be3a933bbe4f8d888906e2aa1b2e35d045a
Quddus Chong [Wed, 11 Mar 2015 23:30:58 +0000 (23:30 +0000)]
am
c706a980: am
a236a49e: am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
* commit '
c706a980e426ea0e0b6aaee5530516b1a16c3755':
docs: Added overview page and Javadocs for the Android Testing Support Library.
Quddus Chong [Wed, 11 Mar 2015 23:24:37 +0000 (23:24 +0000)]
am
a236a49e: am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
* commit '
a236a49edec87cd24fe683550c0ab83be3dcbf07':
docs: Added overview page and Javadocs for the Android Testing Support Library.
Quddus Chong [Wed, 11 Mar 2015 23:16:59 +0000 (23:16 +0000)]
am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
* commit '
47426f1c190b17548eabb50fad3945844f1a7363':
docs: Added overview page and Javadocs for the Android Testing Support Library.
Quddus Chong [Wed, 11 Mar 2015 23:11:02 +0000 (23:11 +0000)]
Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
Quddus Chong [Fri, 27 Feb 2015 00:38:46 +0000 (16:38 -0800)]
docs: Added overview page and Javadocs for the Android Testing Support Library.
Change-Id: I645d3a302ce0d1d4cd389c6a58709a11a0426aed
Deepanshu Gupta [Wed, 11 Mar 2015 22:41:47 +0000 (15:41 -0700)]
Fix rare NPE in BridgeContext.
Also fixed some deprecation warnings.
Change-Id: I2fa00996dab0b008b9ca07a5382a059e5780529d
Tyler Gunn [Fri, 6 Feb 2015 21:56:52 +0000 (13:56 -0800)]
Fix emergency callback number not shown for incoming calls.
- Adding new Connection/Call capability: CAPABILITY_SHOW_CALLBACK_NUMBER.
- Used in Telephony to indicate on an incoming call that the callback
number should be shown.
Bug:
18689292
Change-Id: I1ab3baf9f0d5a22c4b01e6504e88d496182e01c7
Luan Nguyen [Wed, 11 Mar 2015 19:26:09 +0000 (19:26 +0000)]
am
dd7d025b: am
ca0db1a0: am
eeb79d10: am
9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
automerge:
e32c162
* commit '
e32c162a40d55cca897b3572098fa0d552d20be9':
Revert "docs: Update auto landing and design page image assets"
Luan Nguyen [Wed, 11 Mar 2015 19:13:06 +0000 (19:13 +0000)]
am
dd7d025b: am
ca0db1a0: am
eeb79d10: am
9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
* commit '
dd7d025b97aa09723f1695f23b85d1d926cb7ea1':
Revert "docs: Update auto landing and design page image assets"
Luan Nguyen [Wed, 11 Mar 2015 19:07:52 +0000 (19:07 +0000)]
am
ca0db1a0: am
eeb79d10: am
9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
* commit '
ca0db1a0ec0fc0456ec4180d7b0bbac7e43dffec':
Revert "docs: Update auto landing and design page image assets"
Andrew Lee [Wed, 11 Mar 2015 18:32:32 +0000 (18:32 +0000)]
Merge "Indicate local and remote RX/TX capabilities for VT." into m-wireless-dev
Luan Nguyen [Wed, 11 Mar 2015 17:43:15 +0000 (17:43 +0000)]
am
50a9b835: am
42ee70aa: am
24b4e572: am
0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
automerge:
b0422a4
* commit '
b0422a41ed0f0e2c08e92cc75201c53224a01b67':
docs: Update auto landing and design page image assets
Rich Slogar [Wed, 11 Mar 2015 17:43:07 +0000 (17:43 +0000)]
am
8ab872db: am
dcc5a34b: am
08ddf132: am
0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
automerge:
709e9a8
* commit '
709e9a88075570ebbafd53a7921faf7d7436c591':
docs: eclipse revisions update
Andrew Solovay [Wed, 11 Mar 2015 17:42:59 +0000 (17:42 +0000)]
am
a493c489: am
5f8e08ed: am
66b4b317: am
0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
automerge:
baf3451
* commit '
baf345120bc291ec1378618a5cc200ccc78864ba':
docs: Revisions to "Providing Messaging for Auto"
Luan Nguyen [Wed, 11 Mar 2015 17:31:34 +0000 (17:31 +0000)]
am
50a9b835: am
42ee70aa: am
24b4e572: am
0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
* commit '
50a9b83554decb4913fc8eac9862edf902149265':
docs: Update auto landing and design page image assets
Rich Slogar [Wed, 11 Mar 2015 17:31:30 +0000 (17:31 +0000)]
am
8ab872db: am
dcc5a34b: am
08ddf132: am
0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
* commit '
8ab872dba1eff1477cb12da63d1f882260a271ae':
docs: eclipse revisions update
Andrew Solovay [Wed, 11 Mar 2015 17:31:26 +0000 (17:31 +0000)]
am
a493c489: am
5f8e08ed: am
66b4b317: am
0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
* commit '
a493c48989f3c80dd061b86a6216a622b20dfc7f':
docs: Revisions to "Providing Messaging for Auto"
Luan Nguyen [Wed, 11 Mar 2015 17:18:43 +0000 (17:18 +0000)]
am
42ee70aa: am
24b4e572: am
0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
* commit '
42ee70aac023da26a6dc4dee5856871372e792e8':
docs: Update auto landing and design page image assets
Rich Slogar [Wed, 11 Mar 2015 17:18:39 +0000 (17:18 +0000)]
am
dcc5a34b: am
08ddf132: am
0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
* commit '
dcc5a34b14ae09598d9c019c0d4706c5e2d00be2':
docs: eclipse revisions update
Andrew Solovay [Wed, 11 Mar 2015 17:18:23 +0000 (17:18 +0000)]
am
5f8e08ed: am
66b4b317: am
0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
* commit '
5f8e08ed2c97bb92232e500e7c32b31b8bbd5dcd':
docs: Revisions to "Providing Messaging for Auto"
Luan Nguyen [Wed, 11 Mar 2015 16:42:52 +0000 (16:42 +0000)]
am
eeb79d10: am
9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
* commit '
eeb79d104fc09ea727108bde7a7ef06f3300241a':
Revert "docs: Update auto landing and design page image assets"
Luan Nguyen [Wed, 11 Mar 2015 16:35:32 +0000 (16:35 +0000)]
am
9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
* commit '
9a7238d8f5bd4ec90c2b887808ea26e5f55d0154':
Revert "docs: Update auto landing and design page image assets"
Luan Nguyen [Wed, 11 Mar 2015 16:25:32 +0000 (16:25 +0000)]
Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
Luan Nguyen [Wed, 11 Mar 2015 16:20:52 +0000 (16:20 +0000)]
Revert "docs: Update auto landing and design page image assets"
This reverts commit
7859590acd229b66c1953d3d4ed9538261d6b898.
Change-Id: Iab71d4a2ce0eb6dbbab685433a7c991015402e19
Nancy Chen [Thu, 5 Mar 2015 05:02:27 +0000 (21:02 -0800)]
Helper methods for voicemail status provider.
Added method to make it easier to insert into the voicemail status
table. Also takes in a phone account for future multi-SIM support.
Remove VvmSyncService class in favor of moving most of the code to
OmtpVvmSyncService.
Bug:
19236241
Change-Id: I5d9def276fbdbc6f825fb35e9fa31bfc3cead1ba
Deepanshu Gupta [Wed, 11 Mar 2015 01:15:30 +0000 (18:15 -0700)]
Fix project settings.
1. Update layoutlib_api source path.
2. Update jdk version
3. Update nullity annotations.
Change-Id: I48db7dbd7ba5ff02fcf11672608b75e072385166
Deepanshu Gupta [Fri, 6 Mar 2015 02:38:37 +0000 (18:38 -0800)]
Add RecyclerView support.
Bug: http://b.android.com/72117
Change-Id: Iba95baff59f1b715f91da25e15acf27bc052d95e
Andrew Lee [Tue, 10 Mar 2015 20:58:24 +0000 (13:58 -0700)]
Indicate local and remote RX/TX capabilities for VT.
This provides more granular API support for representing the mix of
state and capabilities of local and remote video clients. For our
implementation, we are primarily concerned with bidirectional video
calling. But, this provides support for representing certain error
scenarios, and flexibility for other parties which may desire to
implement one-way video calling.
Change-Id: I0373ffd377c3547fa8dd98ab5fde4f8d616a1d2f
Pavel Zhamaitsiak [Tue, 10 Mar 2015 19:34:02 +0000 (19:34 +0000)]
Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev
automerge:
8b438c8
* commit '
8b438c8c1abc3e5e5cce2c9ee22f64c9a5a30290':
Add strings for IMS Registration error notifications.
Luan Nguyen [Tue, 10 Mar 2015 19:28:57 +0000 (19:28 +0000)]
am
24b4e572: am
0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
* commit '
24b4e5729ed917dc2831a111f917d0a5fbd4e4d0':
docs: Update auto landing and design page image assets
Rich Slogar [Tue, 10 Mar 2015 19:28:53 +0000 (19:28 +0000)]
am
08ddf132: am
0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
* commit '
08ddf132bfb2117d49ea3ca70861a227c39e8115':
docs: eclipse revisions update
Luan Nguyen [Tue, 10 Mar 2015 19:22:37 +0000 (19:22 +0000)]
am
0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
* commit '
0fc17c37a514a80073631dffa381ec07caed93cf':
docs: Update auto landing and design page image assets
Rich Slogar [Tue, 10 Mar 2015 19:22:33 +0000 (19:22 +0000)]
am
0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
* commit '
0c1076b270bd718cab4b89acc96f6cbbbd1e9774':
docs: eclipse revisions update
Pavel Zhamaitsiak [Tue, 10 Mar 2015 19:22:16 +0000 (19:22 +0000)]
Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev
Luan Nguyen [Tue, 10 Mar 2015 19:18:53 +0000 (19:18 +0000)]
Merge "docs: Update auto landing and design page image assets" into lmp-docs
Rich Slogar [Tue, 10 Mar 2015 19:15:00 +0000 (19:15 +0000)]
Merge "docs: eclipse revisions update" into lmp-docs
Rich Slogar [Thu, 5 Mar 2015 00:56:22 +0000 (16:56 -0800)]
docs: eclipse revisions update
Change-Id: I163f9ef9d8cd0c4e4fe5d7a19b76e239af2ee2d3
Vinit Deshpande [Tue, 10 Mar 2015 18:41:45 +0000 (11:41 -0700)]
Add missing system-api.txt for RTT API changes
Change-Id: I85bd48daf3da16ab3b14dc55083fba78372a6cc5
Andrew Solovay [Tue, 10 Mar 2015 15:11:01 +0000 (15:11 +0000)]
am
66b4b317: am
0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
* commit '
66b4b3179b0b98e89daaacf0e4d926c72341ea6a':
docs: Revisions to "Providing Messaging for Auto"
Rich Slogar [Tue, 10 Mar 2015 03:22:26 +0000 (03:22 +0000)]
am
464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
automerge:
9462a93
* commit '
9462a93b053d11e77a3024951ce2c9b36cffb18d':
docs: build tools revision 22.0.0:
Rich Slogar [Tue, 10 Mar 2015 03:08:58 +0000 (03:08 +0000)]
am
464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
* commit '
464a2bc261ac3b3ad817e3d5cc7fa8f3dae0a6c3':
docs: build tools revision 22.0.0:
Vinit Deshpande [Sat, 7 Mar 2015 00:52:00 +0000 (16:52 -0800)]
Few changes to make API check happy [DO NOT MERGE]
These changes are made to make the API check in mwd-staging
happy. It doesn't look like they are needed in master branch;
so marking them as DO NOT MERGE.
Change-Id: I45363165b6a8ffe896cf9a31c0b3cb410aa69cba
Vinit Deshpande [Tue, 10 Mar 2015 02:01:39 +0000 (19:01 -0700)]
am "add 2 side RTT support on scan"
merged from partner/m-wireless-wifi-dev
6e58424 add 2 side RTT support on scan
Vinit Deshpande [Tue, 10 Mar 2015 02:01:39 +0000 (19:01 -0700)]
am "Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev"
merged from partner/m-wireless-wifi-dev
a357b5a Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev
Vinit Deshpande [Tue, 10 Mar 2015 02:01:38 +0000 (19:01 -0700)]
am "Merge "Passpoint API - Take 1" into m-wireless-wifi-dev"
merged from partner/m-wireless-wifi-dev
c4423a5 Merge "Passpoint API - Take 1" into m-wireless-wifi-dev
Vinit Deshpande [Tue, 10 Mar 2015 02:01:37 +0000 (19:01 -0700)]
am "Passpoint API - Take 1"
merged from partner/m-wireless-wifi-dev
b21d248 Passpoint API - Take 1
Vinit Deshpande [Tue, 10 Mar 2015 02:01:37 +0000 (19:01 -0700)]
am "Do not provide 5GHz option for softap if there is no country code available"
merged from partner/m-wireless-wifi-dev
b938c0e Do not provide 5GHz option for softap if there is no country code available
Vinit Deshpande [Tue, 10 Mar 2015 02:01:36 +0000 (19:01 -0700)]
am "Introduce onLost event on bssid hotlist [DO NOT MERGE]"
merged from partner/m-wireless-wifi-dev
ab325cb Introduce onLost event on bssid hotlist [DO NOT MERGE]
Vinit Deshpande [Tue, 10 Mar 2015 02:01:35 +0000 (19:01 -0700)]
am "get channel list from driver for SoftAP channel selection"
merged from partner/m-wireless-wifi-dev
18ae1d2 get channel list from driver for SoftAP channel selection
Vinit Deshpande [Tue, 10 Mar 2015 02:01:34 +0000 (19:01 -0700)]
am "Revert "Initial Passpoint code.""
merged from partner/m-wireless-wifi-dev
5d7768f Revert "Initial Passpoint code."
Vinit Deshpande [Tue, 10 Mar 2015 02:01:33 +0000 (19:01 -0700)]
am "Initial Passpoint code."
merged from partner/m-wireless-wifi-dev
2eba02a Initial Passpoint code.
Vinit Deshpande [Tue, 10 Mar 2015 02:01:32 +0000 (19:01 -0700)]
am "Merge "set softAP on a specified band, including both 2.4 and 5 GHz band" into m-wireless-wifi-dev"
merged from partner/m-wireless-wifi-dev
08cbd3e Merge "set softAP on a specified band, including both 2.4 and 5 GHz band" into m-wireless-wifi-dev
Vinit Deshpande [Tue, 10 Mar 2015 02:01:31 +0000 (19:01 -0700)]
am "set softAP on a specified band, including both 2.4 and 5 GHz band"
merged from partner/m-wireless-wifi-dev
a0be0fb set softAP on a specified band, including both 2.4 and 5 GHz band
Vinit Deshpande [Tue, 10 Mar 2015 02:01:31 +0000 (19:01 -0700)]
am "Bring in passpoint code [DO NOT MERGE]"
merged from partner/m-wireless-wifi-dev
7dd2f6b Bring in passpoint code [DO NOT MERGE]
Vinit Deshpande [Tue, 10 Mar 2015 02:01:29 +0000 (19:01 -0700)]
am "New Additions to WifiScanner APIs [DO NOT MERGE]"
merged from partner/m-wireless-wifi-dev
f45acfe New Additions to WifiScanner APIs [DO NOT MERGE]
Andrew Solovay [Tue, 10 Mar 2015 01:29:29 +0000 (01:29 +0000)]
am
0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
* commit '
0a3f9c7dd26ba31e75552db6ec0eb27cb7267c00':
docs: Revisions to "Providing Messaging for Auto"
Rich Slogar [Mon, 9 Mar 2015 23:42:38 +0000 (23:42 +0000)]
Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
Pavel Zhamaitsiak [Sat, 7 Mar 2015 00:09:18 +0000 (16:09 -0800)]
Add strings for IMS Registration error notifications.
Change-Id: I14808e1dbbd14b5124be7303d586638b9e210269
Luan Nguyen [Thu, 5 Mar 2015 18:38:32 +0000 (10:38 -0800)]
docs: Update auto landing and design page image assets
Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819
Rich Slogar [Mon, 9 Mar 2015 20:04:34 +0000 (20:04 +0000)]
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
* commit '
011f5ceea0d57f9452cdbe42f7a309d28bbd6d59':
docs: android plugin for gradle release 1.1.3 release notes
Rich Slogar [Mon, 9 Mar 2015 19:54:48 +0000 (19:54 +0000)]
am
5a604b35: am
00e3efb5: am
f51020ea: am
6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
* commit '
5a604b359cd487d4a01a397e49117d22848e6809':
docs: android plugin for gradle release 1.1.3 release notes
Andrew Solovay [Wed, 26 Nov 2014 00:20:51 +0000 (16:20 -0800)]
docs: Revisions to "Providing Messaging for Auto"
Added a workflow section and "important classes", and tightened up the
rest of the doc to (hopefully) make it all clearer. See first comment
for doc stage location.
Change-Id: Ifa8db66768a096ae1059ddf17760fee8d74c7c6e
Rich Slogar [Mon, 9 Mar 2015 19:47:18 +0000 (19:47 +0000)]
am
00e3efb5: am
f51020ea: am
6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
* commit '
00e3efb549274ac381c95e359611ce7dcc9542cc':
docs: android plugin for gradle release 1.1.3 release notes
Rich Slogar [Mon, 9 Mar 2015 19:40:48 +0000 (19:40 +0000)]
am
f51020ea: am
6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
* commit '
f51020eaaaff9f54cee1ba91ab35d0212ddb0f54':
docs: android plugin for gradle release 1.1.3 release notes
Rich Slogar [Mon, 9 Mar 2015 19:34:32 +0000 (19:34 +0000)]
am
6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
* commit '
6e1cbe43957b18f471f82682b5df999578230230':
docs: android plugin for gradle release 1.1.3 release notes
Rich Slogar [Mon, 9 Mar 2015 19:29:36 +0000 (19:29 +0000)]
Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
Rich Slogar [Tue, 3 Mar 2015 02:11:33 +0000 (18:11 -0800)]
docs: build tools revision 22.0.0:
Change-Id: Idcc00e2fb0f30c54f28ad0c12c6fb014df681e76
Luan Nguyen [Mon, 9 Mar 2015 17:24:42 +0000 (17:24 +0000)]
am
ea9308cf: am
a9639fe6: am
2fcc438f: am
6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
automerge:
142e90e
* commit '
142e90e5d6fcea4265fbf945a6fc439a4b2efef8':
docs: Add new partners to Wear index page
Etan Cohen [Mon, 9 Mar 2015 17:24:33 +0000 (17:24 +0000)]
Update documentation of IImsConfig interface.
automerge:
796d60b
* commit '
796d60b12e0756db4689632d0985f7a5ed7a47d3':
Update documentation of IImsConfig interface.
Luan Nguyen [Mon, 9 Mar 2015 17:17:04 +0000 (17:17 +0000)]
am
ea9308cf: am
a9639fe6: am
2fcc438f: am
6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
* commit '
ea9308cf6b95858ef4f16222ebb8809621b801ae':
docs: Add new partners to Wear index page
Etan Cohen [Mon, 9 Mar 2015 17:08:49 +0000 (10:08 -0700)]
Update documentation of IImsConfig interface.
Change-Id: Id176c131e0192a2ebb4dd73e902c2a893feebcdc
Luan Nguyen [Mon, 9 Mar 2015 15:05:44 +0000 (15:05 +0000)]
am
a9639fe6: am
2fcc438f: am
6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
* commit '
a9639fe619591888fcc97475de15a55017dd1ff7':
docs: Add new partners to Wear index page
Luan Nguyen [Mon, 9 Mar 2015 14:59:12 +0000 (14:59 +0000)]
am
2fcc438f: am
6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
* commit '
2fcc438f765789e1786cdfe612f61b034ad7344b':
docs: Add new partners to Wear index page