Mark Lu
209fb02f84
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
2016-08-25 21:33:26 +00:00
Hemal Patel
a544221abd
Docs: Fixed the Bluetooth guide link
...
am: 65813dff14
Change-Id: I4502828940c4f2e33363e10728e97f484bc15651
2016-08-25 21:31:56 +00:00
Andrew Solovay
2d629c3e5b
docs: Removing non-English /preview/ directories
...
The remaining docs in the [language]/preview directories were
causing devsite publish to fail (they refer to files that no longer
exist). Removing all those directories; redirects are already set up.
See first comment for doc stage location.
Change-Id: Ic22652d44696ec2647586e19aa61627d40232239
2016-08-25 12:36:36 -07:00
Narayan Kamath
77a9ef952c
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3 am: 8e168116d0 am: dd496ec8b0
...
am: 472a7792f3
Change-Id: I065968bf2bd6166eae33c7eec347e371a5edf447
2016-08-25 01:25:55 +00:00
David Christie
9c4d02fb3f
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30 am: 8788a2413c am: c6ab92e93b am: 3970ee98f7 am: 735699f3ef am: 551e6c786f
...
am: 80b8f38224
Change-Id: I43da972f73a86a305d2b20db6cb2d30180e7287c
2016-08-25 01:25:46 +00:00
David Christie
0ae74a8ccd
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48 am: 0777ad8253 am: 187d841b75
...
am: 7f2aaf204d
Change-Id: I64ff311815620d7e26ef91d33afc8499abf63c83
2016-08-25 01:25:38 +00:00
David Christie
4f1d1fc92d
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70 am: a6de8f20c7
...
am: 00e1e39ae2
Change-Id: I23587e80ea85f66e872e8bf0a9b1f83399c3b6fc
2016-08-25 01:25:30 +00:00
David Christie
36246a43e5
resolve merge conflicts of 8aaffd9 to nyc-dev
...
Change-Id: I4b1603b4cb1cdfc01f4842b2facf8c31a687bbe5
2016-08-24 16:45:01 -07:00
Narayan Kamath
472a7792f3
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3 am: 8e168116d0
...
am: dd496ec8b0
Change-Id: Ibd47e114558f0fc8ce64cd006a79e6ead7445f1d
2016-08-24 22:43:15 +00:00
David Christie
80b8f38224
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30 am: 8788a2413c am: c6ab92e93b am: 3970ee98f7 am: 735699f3ef
...
am: 551e6c786f
Change-Id: I9e0e082d0638795f191a188d3caad85f5fb992e5
2016-08-24 22:43:12 +00:00
David Christie
7f2aaf204d
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48 am: 0777ad8253
...
am: 187d841b75
Change-Id: I063f0cd3f53be4d58d123d05da7171a47014929d
2016-08-24 22:43:09 +00:00
David Christie
00e1e39ae2
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70
...
am: a6de8f20c7
Change-Id: I119a274dd1050c6d26b70c7fbfb5ea95662e2a83
2016-08-24 22:39:52 +00:00
Narayan Kamath
dd496ec8b0
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3
...
am: 8e168116d0
Change-Id: Iffa2e8ae4f02adaf4c031d8b5d50362ee9efb1d1
2016-08-24 22:33:43 +00:00
David Christie
551e6c786f
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30 am: 8788a2413c am: c6ab92e93b am: 3970ee98f7
...
am: 735699f3ef
Change-Id: I80e68cde7a673cfb269ecad9114dbb14850287b4
2016-08-24 22:33:41 +00:00
David Christie
187d841b75
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48
...
am: 0777ad8253
Change-Id: I9403ca33c0b87ca1ca01f2ce5209c12332b01e51
2016-08-24 22:33:39 +00:00
David Christie
a6de8f20c7
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619
...
am: 3aaac55e70
Change-Id: I01b09466d9993f28de5c95a7d21555b3be112891
2016-08-24 22:33:37 +00:00
David Christie
8aaffd9ebf
resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5 am: e24eb2dbb5
...
am: 362668b6f7
Change-Id: I019f76b45de78171ef888d2175dc9140be172784
2016-08-24 22:30:20 +00:00
Narayan Kamath
8e168116d0
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04
...
am: c01db7dca3
Change-Id: I056c33c5925a625b539df250af0fa7d48258b0f2
2016-08-24 22:23:54 +00:00
David Christie
735699f3ef
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30 am: 8788a2413c am: c6ab92e93b
...
am: 3970ee98f7
Change-Id: I68f89fabe5603941e009f48f3277a2c40221ce74
2016-08-24 22:23:52 +00:00
David Christie
0777ad8253
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66
...
am: d610363a48
Change-Id: I186b4bedcf057489deca1e161a052619ce594e56
2016-08-24 22:23:49 +00:00
David Christie
3aaac55e70
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d
...
am: dd1016c619
Change-Id: I54910f6c22b69b029be80007cdbf06b203886398
2016-08-24 22:23:46 +00:00
David Christie
362668b6f7
resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5
...
am: e24eb2dbb5
Change-Id: Idb6cbe8c16877301aed50faed41fa0390db3cf10
2016-08-24 22:23:42 +00:00
David Christie
e24eb2dbb5
resolve merge conflicts of a2399b4 to mnc-dev
...
am: 6195acc2b5
Change-Id: I34c3133924af9906b88ebd5faf78e0c000aa05be
2016-08-24 22:16:07 +00:00
Narayan Kamath
c01db7dca3
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f
...
am: c11e8fcc04
Change-Id: Idd314c1e12919d8cbaf9e71d72519d34d18e6f01
2016-08-24 22:14:36 +00:00
David Christie
3970ee98f7
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30 am: 8788a2413c
...
am: c6ab92e93b
Change-Id: I0d17aacc1d83b2bceb9abcfa3da1f1ff3dc74e09
2016-08-24 22:14:32 +00:00
David Christie
d610363a48
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1
...
am: af369f6e66
Change-Id: I6973f8f1053644548062b94c1696c123f47f0ad4
2016-08-24 22:14:28 +00:00
David Christie
dd1016c619
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev
...
am: 975879a18d
Change-Id: Icf81e5ce2bc02750d66b13feedfc098dd9374167
2016-08-24 22:14:24 +00:00
David Christie
6195acc2b5
resolve merge conflicts of a2399b4 to mnc-dev
...
Change-Id: Ifc9e13cdb047ef70799ba8b1b9e91357ef5f2d2a
2016-08-24 13:47:57 -07:00
Narayan Kamath
c11e8fcc04
Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108 am: b56f4f53e1 -s ours am: 2984748753 am: b9fae65605
...
am: c6c7ca0cde
Change-Id: Ifca9f825dac758c653560c41b81a13bd13c9fd4c
2016-08-24 20:30:13 +00:00
Narayan Kamath
c6ab92e93b
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f
...
am: 3c63bb367f
Change-Id: Iaa5ba9f3fcc28da14b60dc489e49bd177d2bfcb3
2016-08-24 20:30:09 +00:00
David Christie
af369f6e66
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30
...
am: 8788a2413c
Change-Id: If9d5385d7d949e85932e5586d4884ffe84d51d47
2016-08-24 20:30:06 +00:00
David Christie
975879a18d
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24
...
am: 41a0dd41f1
Change-Id: Ib74b0efa9b9345257d2b3ba59911baa324ec5801
2016-08-24 20:30:01 +00:00
Salvador Martinez
ed004e2958
Merge "Added error handling to settings suggestions list" into nyc-dev
2016-08-24 18:17:40 +00:00
TreeHugger Robot
462f29f77f
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
2016-08-24 17:27:09 +00:00
Salvador Martinez
18bf581c77
Added error handling to settings suggestions list
...
The suggestions list in the summary page of the
settings app could sometimes cause a crash due to
an uncaught exception. Tis fixed now.
Bug: 30656840
Change-Id: If79f53e6a8c17a81653228d613797e94c473d410
(cherry picked from commit 60d92b3b8390e33e069f343d6a425ab07c498d3d)
2016-08-24 16:43:22 +00:00
David Christie
a2399b45e2
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev
...
Change-Id: Ic44c577ef364bf81dd1e30b50c71718d4910eb10
2016-08-23 16:19:51 -07:00
Julius D'souza
b2507eb7b7
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am: 3275a3a5a5 -s ours
...
am: d5bf4039a9 -s ours
Change-Id: I4f1a0acabe5d5385af086791b906ff6f45424e59
2016-08-23 16:52:24 +00:00
Julius D'souza
d5bf4039a9
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
...
am: 3275a3a5a5 -s ours
Change-Id: Iaae7763a4d744ad8a63538750c5ed3efe38161d5
2016-08-23 16:45:41 +00:00
Scott Main
77917a835f
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev
2016-08-23 15:42:03 +00:00
Yang Ni
c069ed7f8c
Updated user document for Single-Source RenderScript
...
Bug: 29875503
Bug: 29879448
Added a section introducing the new single-source feature.
Local staging:
http://yangni.mtv.corp.google.com/guide/topics/renderscript/compute.html
This updates
https://developer.android.com/guide/topics/renderscript/compute.html
Change-Id: I62dda3ab60b1678a9580fd2873f64f33d9696e13
2016-08-22 23:33:13 +00:00
Alan Viverette
66b3a0d1aa
Avoid potential re-entry as a result of child mutation
...
Don't set the callback until we're all done making changes.
Bug: 30902893
Change-Id: Ia1560692a83ecb2c50f5e77fa4d1e8155a78a204
(cherry picked from commit b46ba3b2b0268688852cdf3d1fb4afe4873d63be)
2016-08-22 20:00:30 +00:00
Julius D'souza
3275a3a5a5
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
...
Bug: 18572096
Change-Id: Ie0ff1990b8f4a3d435328834871f04a6e2bd5e97
2016-08-22 11:40:03 -07:00
Dirk Dougherty
e816f1f542
Doc change: intl page updates for final n release.
...
Change-Id: I11445717cf49438ba5a04b50245209161740d4b0
2016-08-22 01:13:59 -07:00
Dirk Dougherty
b0ca00431f
Doc change: updates for final N landing page and related resources.
...
Change-Id: Ieeb3dd74a889d6c0118e4ca8575abdaddcde7e73
2016-08-19 19:38:47 -07:00
David Friedman
410ae5b004
Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev
2016-08-19 21:17:56 +00:00
David Friedman
162a0005ac
Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev
2016-08-19 21:16:56 +00:00
Jim Miller
ce0856f702
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am: 02e9affa42 am: ddf70b9195
...
am: 364a51221a -s ours
Change-Id: Iccf0d83b5bbf076684343a0979d7eac718be0603
2016-08-19 20:23:50 +00:00
Jim Miller
f159feff98
Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2 am: 9f04985991
...
am: 85c390e9fb -s ours
Change-Id: I07ac3fe88dd7acc7ced6b4483d98efe1797bea21
2016-08-19 20:23:45 +00:00
Jim Miller
364a51221a
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am: 02e9affa42
...
am: ddf70b9195
Change-Id: I8308733be4ac586377b0545057dbf982875e4da5
2016-08-19 20:16:37 +00:00
Jim Miller
85c390e9fb
Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2
...
am: 9f04985991
Change-Id: Iff24a78b5a4b4de9b866105fbce2a181125b771e
2016-08-19 20:16:34 +00:00
