Andrew Solovay
11014feaed
am 0b7e1baf: am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev
...
* commit '0b7e1bafe5e722bd8c620f8d404e39a2c37d893c':
Moved TV Input Framework (TIF) page out of preview.
2014-10-16 18:59:59 +00:00
Chenjie Luo
8fac66821c
Merge "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" into lmp-sprout-dev
2014-10-16 18:45:08 +00:00
Scott Rowe
c9f6bb8e36
am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
...
* commit '447369f2d2b02f78d01d4a4923fedfca96c1950f':
docs: update reference to FragmentRetainInstance
2014-10-16 18:42:20 +00:00
Joe Fernandez
518a54aed6
am 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
...
* commit '7e19b402c6651112a56ab8569ea53a7004a3a552':
Typo fixed in sample code
2014-10-16 18:42:16 +00:00
Scott Rowe
f1b9b1f992
am f83c56cd: am a3bc95c5: am 8f93624e: docs: delete preview pages
...
* commit 'f83c56cd425099e35dab81f01d1892abffc7f72f':
docs: delete preview pages
2014-10-16 18:39:55 +00:00
Prerepa Viswanadham
2e8beaed54
am 06819409: am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
...
* commit '06819409c673b6f93c1df9f7d6949f623ff67192':
Update javadoc comments for getBluetoothLeAdvertiser()
2014-10-16 18:39:51 +00:00
Lorenzo Colitti
dc14068a7d
am e526668e: am d04d6c91: am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev
...
* commit 'e526668eae7ba79e9558cb2b34486bbae2403fd5':
Allow root and system to bypass the always-on VPN firewall rules
2014-10-16 18:39:46 +00:00
Lorenzo Colitti
b7ba3e21e2
am 94dbc64c: am ffd73350: am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev
...
* commit '94dbc64c9871d394fc7038c95cc140c52ad35255':
Don't make lockdown VPN source firewall rules over-broad.
2014-10-16 18:39:41 +00:00
Lorenzo Colitti
03c0c78575
am 5fa2929f: am 24f9a26c: am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
...
* commit '5fa2929f161164c8040a1b1ab35b04d43de6374c':
Propagate network state changes to the LockdownVpnTracker.
2014-10-16 18:39:37 +00:00
Christopher Tate
d1ec1c4715
am 31e4eeb2: am ce39d25f: am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev
...
* commit '31e4eeb26f2c843d141f969271cff8e825909788':
Fix spurious restore session timeouts
2014-10-16 18:39:32 +00:00
Chenjie Luo
c597c55ffe
Add system property config.disable_timeupdate to configure NetworkTimeUpdateService
...
Bug: 17934875
Change-Id: Ic1acff13190f38cedb1ecf22783d4dfd3373511d
2014-10-16 11:36:31 -07:00
Scott Rowe
f83c56cd42
am a3bc95c5: am 8f93624e: docs: delete preview pages
...
* commit 'a3bc95c50638b869a4d9aa8b0fefb6862b8cdc05':
docs: delete preview pages
2014-10-16 18:35:40 +00:00
Prerepa Viswanadham
06819409c6
am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
...
* commit '56302744c4b22342798e3a08c03b34322a8a9dd3':
Update javadoc comments for getBluetoothLeAdvertiser()
2014-10-16 18:35:33 +00:00
Lorenzo Colitti
e526668eae
am d04d6c91: am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev
...
* commit 'd04d6c91a311af7a52f05fac5935c9327a990046':
Allow root and system to bypass the always-on VPN firewall rules
2014-10-16 18:35:21 +00:00
Lorenzo Colitti
94dbc64c98
am ffd73350: am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev
...
* commit 'ffd7335088d228ac0c56fdc7e2faba79c78572bf':
Don't make lockdown VPN source firewall rules over-broad.
2014-10-16 18:35:18 +00:00
Lorenzo Colitti
5fa2929f16
am 24f9a26c: am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
...
* commit '24f9a26cea200d9452bd922d94f8669d87744f53':
Propagate network state changes to the LockdownVpnTracker.
2014-10-16 18:35:14 +00:00
Christopher Tate
31e4eeb26f
am ce39d25f: am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev
...
* commit 'ce39d25f2c5908c3f6067a70b2ab504929e2eb5f':
Fix spurious restore session timeouts
2014-10-16 18:34:56 +00:00
Scott Rowe
447369f2d2
am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
...
* commit 'a1e3063ebe04c8c304f48a02117085962f75cb63':
docs: update reference to FragmentRetainInstance
2014-10-16 18:23:42 +00:00
Joe Fernandez
7e19b402c6
am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
...
* commit '2f9ea27c6c95fa53eef0228edc0b3f63dbeb21e7':
Typo fixed in sample code
2014-10-16 18:23:18 +00:00
David Friedman
b0683f0c3f
am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev
...
* commit 'd12e6de645a39e6e902785d544100fb1963aa203':
OpenGL 3.1 and AEP documentation for L-release.
2014-10-16 18:10:36 +00:00
David Friedman
d12e6de645
Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev
2014-10-16 18:06:01 +00:00
Quddus Chong
49cc89ec51
docs: Updates to Android 5.0 API Overview.
...
Change-Id: I0dcbb134fc499da0172bfe8d79c5aaa1a4b3ef75
2014-10-16 11:01:42 -07:00
Geoff Mendal
a9e131ce28
am c218d8f1: (-s ours) am 00e4d783: (-s ours) am c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'c218d8f19881deed098875e2caf41b7ca9e42133':
Import translations. DO NOT MERGE
2014-10-16 17:56:38 +00:00
Brian Carlstrom
fe6cde379a
am 6580c273: am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
...
* commit '6580c273a51daee08972149f2d2ede8ef6e7a79a':
Set threads' contextClassLoader during LoadedApk.makeApplication.
2014-10-16 17:56:33 +00:00
Geoff Mendal
299c69078b
am 551deffb: (-s ours) am fb035685: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '551deffb7679e893ee8df750914cdb978bf2afb5':
Import translations. DO NOT MERGE
2014-10-16 17:56:28 +00:00
Marco Nelissen
d3a62f1b6e
am a2d77ed7: am 4683a10f: am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev
...
* commit 'a2d77ed7d7abc1cf10fb961dd8a64f3a9e323736':
Also consider secondary storage when verifying paths
2014-10-16 17:56:21 +00:00
Dirk Dougherty
07d717affc
am 7e4a3aec: am 0cd670b3: am a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev
...
* commit '7e4a3aecbd9ebc3c91a50eacfe24293811338df9':
Doc change: Add diffs for API level 21.
2014-10-16 17:56:16 +00:00
Geoff Mendal
c218d8f198
am 00e4d783: (-s ours) am c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '00e4d7830cc7834efdcec2a35d130cbc89e16551':
Import translations. DO NOT MERGE
2014-10-16 17:45:58 +00:00
Brian Carlstrom
6580c273a5
am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
...
* commit 'd2b824887f9ec2e3448bd38aae58efbc4f178997':
Set threads' contextClassLoader during LoadedApk.makeApplication.
2014-10-16 17:45:54 +00:00
Geoff Mendal
551deffb76
am fb035685: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'fb0356852dad1daeb673cdf117193a8421f66aaa':
Import translations. DO NOT MERGE
2014-10-16 17:45:45 +00:00
Marco Nelissen
a2d77ed7d7
am 4683a10f: am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev
...
* commit '4683a10f9c8c73056e5e1f9748ab9eee701dc3fa':
Also consider secondary storage when verifying paths
2014-10-16 17:45:36 +00:00
Dirk Dougherty
7e4a3aecbd
am 0cd670b3: am a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev
...
* commit '0cd670b39be13e1840927694b36d6c61e5c7c1dd':
Doc change: Add diffs for API level 21.
2014-10-16 17:45:31 +00:00
Svet Ganov
d5b0842a1d
Send accessibility events with no window.
...
An app can send an accessibility event by calling the send methods
on view or directly asking the accessibility manager to do that.
While the recommened way to send such events is calling the methods
on view a legacy app or app whose developer did not read the docs
carefully may be calling the accessibility manager APIs directly.
In such a case the event does not have assigned window id and does
not get send. Since events fired by using the accessibility manager
directly lack context to determine whether thier source is important
for accessibility we assume they come from an important view to
avoid breaking backwards compatibility.
bug:18001711
Change-Id: Ie1c298fa5a0670cbeaedfcd64f820961c296b6ca
2014-10-16 17:31:52 +00:00
Andrew Solovay
6f6d10e744
docs: Updating support library pages for v.21.
...
For doc stage location, see my comment of Oct 13 3:47 PM.
Change-Id: I4da98448cd95451c82b4e8198dcd95edf64398b8
2014-10-16 10:31:31 -07:00
Rich Slogar
349e3640b7
am 70807ab1: Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev
...
* commit '70807ab128c544b972f3710e53eeedd0d40dce2a':
docs:Build and Platform Tools Updates for Android 5
2014-10-16 17:15:23 +00:00
Rich Slogar
70807ab128
Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev
2014-10-16 17:10:49 +00:00
Andrew Solovay
0b7e1bafe5
am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev
...
* commit '34ef4ff9b7a3625477b0eccd20db15129f2732f3':
Moved TV Input Framework (TIF) page out of preview.
2014-10-16 17:08:33 +00:00
Andrew Solovay
34ef4ff9b7
Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev
2014-10-16 17:03:02 +00:00
Rich Slogar
54444f66a4
docs:Build and Platform Tools Updates for Android 5
...
Change-Id: Ib7adf35c302d24a1c2394a89b3a04ca8d77cd296
2014-10-16 10:02:22 -07:00
Scott Rowe
a1e3063ebe
am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
...
* commit 'ab64919c0e683dcd0f32f95f580f0d95ce29476d':
docs: update reference to FragmentRetainInstance
2014-10-16 17:01:04 +00:00
Scott Rowe
ab64919c0e
Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
2014-10-16 16:56:55 +00:00
Scott Rowe
a3bc95c506
am 8f93624e: docs: delete preview pages
...
* commit '8f93624eafd3518d97c88506bbb9a93c81eb7f03':
docs: delete preview pages
2014-10-16 16:44:30 +00:00
Scott Rowe
8f93624eaf
docs: delete preview pages
...
Change-Id: I76b6b8545bfed3ad0604043105ccf4795ab8be62
2014-10-16 09:39:04 -07:00
Prerepa Viswanadham
56302744c4
am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
...
* commit '248edc3e969217aec1fcce7f324cbae6c46da0a3':
Update javadoc comments for getBluetoothLeAdvertiser()
2014-10-16 16:11:26 +00:00
Prerepa Viswanadham
248edc3e96
Update javadoc comments for getBluetoothLeAdvertiser()
...
To clarify that BluetoothLeAdvertiser object will return null
when BT is off OR if the hw doesn't support these capabilities
bug: 18006072
Change-Id: I635d7971711a3cae7c58f7a0636faf9a03f19970
2014-10-16 16:06:44 +00:00
Adrian Roos
c344cdc1bb
am ccb7a9af: Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev
...
* commit 'ccb7a9af271836fde98636d9ce6ebbda09eb0158':
Prevent ChooserActivity from taking over the system bars
2014-10-16 14:56:40 +00:00
Adrian Roos
ccb7a9af27
Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev
2014-10-16 14:54:19 +00:00
Joe Fernandez
2f9ea27c6c
am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
...
* commit '58c64870a8f3505d032ec7c5ac0fc4faba08347a':
Typo fixed in sample code
2014-10-16 14:39:16 +00:00
Joe Fernandez
58c64870a8
Merge "Typo fixed in sample code" into klp-modular-docs
2014-10-16 14:34:47 +00:00
George Mount
27a08f2ad5
am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev
...
* commit 'ea6f0ae86d62cff88d63b926578c588a956d0512':
Use empty snapshots list when there are no shared elements.
2014-10-16 14:25:45 +00:00