Rich Slogar
191131d449
am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
...
* commit '50e8b020f69687f11a0abce4ec5312697f9a1449':
docs: gradle plugin version update
2015-02-27 22:43:42 +00:00
Rich Slogar
50e8b020f6
am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
...
* commit 'a83f64451d55882366491e66c7479f194e0625ea':
docs: gradle plugin version update
2015-02-27 22:37:17 +00:00
Rich Slogar
a83f64451d
Merge "docs: gradle plugin version update" into lmp-docs
2015-02-27 22:31:33 +00:00
Rich Slogar
5fcfe207fe
docs: gradle plugin version update
...
b.android 153270
Change-Id: I0c752fdf28181c50924a1ca946b5110f773659dc
2015-02-27 14:29:24 -08:00
Luan Nguyen
9036eebd4b
am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
...
* commit 'dedba01ac8b85d535171a910aa6b72ea9ce4498c':
docs: Add steps to enable adb debugging on Wear device
2015-02-27 17:00:25 +00:00
Ryosuke Matsuuchi
8f7c8373f9
am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit 'd4cdf18e1c763c2aaedbb4f0cab3657db2adc097':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 17:00:20 +00:00
Andrew Solovay
db1064238e
am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
...
* commit '3a5b08153e432b79e40bc5ddd62db2bb5fcf71e9':
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
2015-02-27 17:00:16 +00:00
Luan Nguyen
dedba01ac8
am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
...
* commit 'd57871e00d77bc852948de30a01b6856a6cfeb9b':
docs: Add steps to enable adb debugging on Wear device
2015-02-27 16:53:47 +00:00
Ryosuke Matsuuchi
d4cdf18e1c
am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit 'b859313312a85285c2c243a5e58d133e308ee590':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:53:42 +00:00
Andrew Solovay
3a5b08153e
am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
...
* commit '3daee37705d23a0f91680aa954e4bcdb2dfdf4e8':
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
2015-02-27 16:53:37 +00:00
Luan Nguyen
d57871e00d
am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
...
* commit '8aa8960edb10089570acd5d3b19cfd9be7253fab':
docs: Add steps to enable adb debugging on Wear device
2015-02-27 16:46:56 +00:00
Ryosuke Matsuuchi
b859313312
am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit 'c1120b459eb1ecabd54966cef1873f0f0707382d':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:46:53 +00:00
Andrew Solovay
3daee37705
am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
...
* commit '7f26f2b96a23f32bca69862b254dbbe8b59049d9':
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
2015-02-27 16:46:49 +00:00
Luan Nguyen
8aa8960edb
am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
...
* commit 'a464d409f68ca9a59ac4261edd46866ae2af68bf':
docs: Add steps to enable adb debugging on Wear device
2015-02-27 16:37:46 +00:00
Ryosuke Matsuuchi
c1120b459e
am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit '8f0e9c7593fee981fc4b3831aae76a1f20e236db':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:37:42 +00:00
Andrew Solovay
7f26f2b96a
am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
...
* commit 'b5e00e5c3db7fc7121aeff6dc7d20b21740d47e5':
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
2015-02-27 16:37:38 +00:00
Luan Nguyen
a464d409f6
Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
2015-02-27 15:07:02 +00:00
Lorenzo Colitti
73b0048c70
Merge "Separate NAT from forwarding." into lmp-mr1-wfc-dev
2015-02-27 07:09:25 +00:00
Lorenzo Colitti
35e36db1d7
Separate NAT from forwarding.
...
Bug: 19500693
Change-Id: I39878644e21d51def1c31d1857e815f473ef0938
2015-02-27 15:53:28 +09:00
Ryosuke Matsuuchi
8f0e9c7593
Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
2015-02-27 03:41:51 +00:00
Deepanshu Gupta
2045061aac
Add status bar time for 5.1
...
Change-Id: I9469cdbbc5cbfe5cb99d9c4ee6f4e299246d409f
2015-02-26 19:35:54 -08:00
Lorenzo Colitti
42ad7b5af4
Merge "Append forwarder name to ipfwd command" into lmp-mr1-wfc-dev
2015-02-27 00:46:13 +00:00
Deepanshu Gupta
1a10ca7e52
Correct PorterDuff filters.
...
1. Remove unused modes - makes the class more manageable, and missing
modes can always be readded from the git history.
2. Reuse the existing BlendComposite instances where possible.
3. Fix incorrect alpha computation for multiply mode.
4. Change the alpha computation for all blend modes to compenstate for
the fact that the color filter image that we create extends beyond the
image it is inteded to be applied to.
Change-Id: Iedebf289a23325ee4c6d406dcad46a9edb1855c7
2015-02-26 15:02:16 -08:00
Andrew Solovay
b5e00e5c3d
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
...
Documented new support for users upgrading/downgrading subscriptions
in the middle of a sub period, and for users manually renewing
before the subscription period ends. Also updated testing docs
to reflect that sandbox now supports testing subscriptions, and
documented new "autoRenewing" field in INAPP_PURCHASE_DATA.
See first comment for doc stage location.
bug: 18982828
bug: 18916814
bug: 18951608
bug: 18908756
Change-Id: I530b57d840ed5aeefe4c6a688a2e59aec41ec7d0
2015-02-26 14:34:48 -08:00
Deepanshu Gupta
d68448a601
Fix codestyle for switch statements.
...
Fix intellij's codestyle settings for indenting switch/case statement.
Change-Id: I905231538fef0fcd7fa4e742f937b8da34f2e30f
2015-02-26 14:32:30 -08:00
Sanket Padawe
8b76495751
am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev
...
* commit '025f0938544bae3262acc24e9c6031b6de88901d':
Changing usage of carrier name field of SubInfoRecord
2015-02-26 22:09:10 +00:00
Jason Monk
2db6e09fde
am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev
...
* commit '9df42df2bca0a7a91d813b19e084069675d4057b':
Keyguard: Use plmn/spn broadcast when no SIMs
2015-02-26 21:58:39 +00:00
Sanket Padawe
025f093854
Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev
2015-02-26 21:58:28 +00:00
Jason Monk
9df42df2bc
Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev
2015-02-26 21:54:23 +00:00
Rich Slogar
8472a74c89
am 328dc428: am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
...
* commit '328dc4288bc86b6f7a7db56d7bfb17053e94ec1c':
docs: 9patch tool update
2015-02-26 18:30:21 +00:00
Rich Slogar
328dc4288b
am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
...
* commit '6bb23d627f608461f6dd5f40308ac176a327d99b':
docs: 9patch tool update
2015-02-26 18:22:34 +00:00
Rich Slogar
6bb23d627f
am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
...
* commit '299366847f50059fb3e13b573247d9a05d29eb3c':
docs: 9patch tool update
2015-02-26 18:15:41 +00:00
Rich Slogar
299366847f
am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
...
* commit '0a504745b4f63bd9f1d5e40addf50a6e90b8522d':
docs: 9patch tool update
2015-02-26 18:08:39 +00:00
Rich Slogar
0a504745b4
Merge "docs: 9patch tool update" into lmp-docs
2015-02-26 18:02:43 +00:00
Yashdev Singh
bece926b51
Telephony: Implementation for IWLAN.
...
Introduce new RAT as IWLAN.
- Allow registration polling in airplane mode.
- Allow non-default PDP activation for iwlan RAT.
Implementation of iwlan and wwan coexistence.
- A new callback event for unsol oem hook response to indicate
if cellular and iwlan RAT co-exists.
- If co-existence is possible then allow default PDP activation
along with other PDPs.
Change-Id: Icc6f8111ec3c86ec06e8facd5a5b60b4d5e08e78
2015-02-26 06:37:36 +00:00
Rich Slogar
3882afbd97
am bd409177: am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
...
* commit 'bd409177ec6b422e18d9e0c94ffab86dfd368976':
docs: remove exploring sdk link
2015-02-25 23:40:01 +00:00
Rich Slogar
8451fef364
am 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
...
* commit '81049aff4bad07427dc18543be1c759e16267a63':
docs: note to install linux packages v2 update
2015-02-25 23:39:56 +00:00
Rich Slogar
2868e7260a
docs: build image updates
...
Change-Id: I9bc252b2f3a43085b69b1177242cc8b1fc0e0662
2015-02-25 15:39:07 -08:00
xinhe
a357b5adf0
Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev
2015-02-25 23:34:40 +00:00
Rich Slogar
bd409177ec
am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
...
* commit '1836eea08229dda72ff89d24f75f9f4948be957e':
docs: remove exploring sdk link
2015-02-25 23:32:51 +00:00
Rich Slogar
81049aff4b
am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
...
* commit 'f8a95b0b6fc4e19c7935a2fb46c5b7b6cef3a194':
docs: note to install linux packages v2 update
2015-02-25 23:32:46 +00:00
Rich Slogar
1836eea082
am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
...
* commit '411046324743055e9eef3b04109c998b5354b496':
docs: remove exploring sdk link
2015-02-25 23:25:11 +00:00
Rich Slogar
f8a95b0b6f
am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
...
* commit '84994e876e728fa57f06d803f7c4abfbc9df40db':
docs: note to install linux packages v2 update
2015-02-25 23:25:07 +00:00
Rich Slogar
4110463247
am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
...
* commit 'eedf6ad8ce1e15276311a78488e27388f049b4c0':
docs: remove exploring sdk link
2015-02-25 23:17:31 +00:00
Rich Slogar
84994e876e
am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
...
* commit 'db2ebca7ed10a4d5d943e414a35d4734b9987e91':
docs: note to install linux packages v2 update
2015-02-25 23:17:23 +00:00
Rich Slogar
eedf6ad8ce
Merge "docs: remove exploring sdk link" into lmp-docs
2015-02-25 23:12:37 +00:00
Rich Slogar
db2ebca7ed
Merge "docs: note to install linux packages v2 update" into lmp-docs
2015-02-25 23:11:24 +00:00
Luan Nguyen
43836ac798
docs: Add steps to enable adb debugging on Wear device
...
bug: 19425073
Change-Id: Iead63dfe12c5187c5ed8e452fe7e934402ebd056
2015-02-25 15:09:29 -08:00
Vinit Deshpande
c4423a5f0a
Merge "Passpoint API - Take 1" into m-wireless-wifi-dev
2015-02-25 20:04:00 +00:00
Jim Miller
04d3e55c95
am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
...
* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
Remove TrustAgent whitelisting API
2015-02-25 18:09:37 +00:00