OSDN Git Service
Dirk Dougherty [Thu, 25 Aug 2016 21:50:54 +0000 (14:50 -0700)]
Fetch ga script over https to avoid mixed content.
Change-Id: Ic8f3421c67464b941312d6854267adfdf499aa43
TreeHugger Robot [Thu, 25 Aug 2016 21:38:41 +0000 (21:38 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-dev
Mark Lu [Thu, 25 Aug 2016 21:34:02 +0000 (21:34 +0000)]
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev
Mark Lu [Thu, 25 Aug 2016 21:33:28 +0000 (21:33 +0000)]
Merge "docs: fix broken links in Activity reference" into nyc-dev
Mark Lu [Thu, 25 Aug 2016 21:33:24 +0000 (21:33 +0000)]
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
Hemal Patel [Thu, 25 Aug 2016 21:31:56 +0000 (21:31 +0000)]
Docs: Fixed the Bluetooth guide link
am:
65813dff14
Change-Id: I4502828940c4f2e33363e10728e97f484bc15651
Dianne Hackborn [Wed, 24 Aug 2016 21:54:20 +0000 (14:54 -0700)]
Try to mitigate issue #
31016187: system_server crash in ArraySet.
Instead of crashing, log a wtf and recover. This is not a problem
in ArraySet, but caused by someone else using an ArraySet without
protecting access to it. So whoever is calling at this point is
not the cause, and it isn't worthwhile to let them crash.
Change-Id: Iaefa4315b620c9fe24b31507e4aa47a8525c8540
(cherry picked from commit
92aa4b2ba3c93cc344c885b50b75726599e6065d)
Andrew Solovay [Thu, 25 Aug 2016 19:36:36 +0000 (12:36 -0700)]
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
Narayan Kamath [Thu, 25 Aug 2016 01:25:55 +0000 (01:25 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f am:
3c63bb367f am:
c11e8fcc04 am:
c01db7dca3 am:
8e168116d0 am:
dd496ec8b0
am:
472a7792f3
Change-Id: I065968bf2bd6166eae33c7eec347e371a5edf447
David Christie [Thu, 25 Aug 2016 01:25:46 +0000 (01:25 +0000)]
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
David Christie [Thu, 25 Aug 2016 01:25:38 +0000 (01:25 +0000)]
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
David Christie [Thu, 25 Aug 2016 01:25:30 +0000 (01:25 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev am:
975879a18d am:
dd1016c619 am:
3aaac55e70 am:
a6de8f20c7
am:
00e1e39ae2
Change-Id: I23587e80ea85f66e872e8bf0a9b1f83399c3b6fc
David Christie [Wed, 24 Aug 2016 23:45:01 +0000 (16:45 -0700)]
resolve merge conflicts of
8aaffd9 to nyc-dev
Change-Id: I4b1603b4cb1cdfc01f4842b2facf8c31a687bbe5
Narayan Kamath [Wed, 24 Aug 2016 22:43:15 +0000 (22:43 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f am:
3c63bb367f am:
c11e8fcc04 am:
c01db7dca3 am:
8e168116d0
am:
dd496ec8b0
Change-Id: Ibd47e114558f0fc8ce64cd006a79e6ead7445f1d
David Christie [Wed, 24 Aug 2016 22:43:12 +0000 (22:43 +0000)]
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
David Christie [Wed, 24 Aug 2016 22:43:09 +0000 (22:43 +0000)]
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
David Christie [Wed, 24 Aug 2016 22:39:52 +0000 (22:39 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev am:
975879a18d am:
dd1016c619 am:
3aaac55e70
am:
a6de8f20c7
Change-Id: I119a274dd1050c6d26b70c7fbfb5ea95662e2a83
Narayan Kamath [Wed, 24 Aug 2016 22:33:43 +0000 (22:33 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f am:
3c63bb367f am:
c11e8fcc04 am:
c01db7dca3
am:
8e168116d0
Change-Id: Iffa2e8ae4f02adaf4c031d8b5d50362ee9efb1d1
David Christie [Wed, 24 Aug 2016 22:33:41 +0000 (22:33 +0000)]
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
David Christie [Wed, 24 Aug 2016 22:33:39 +0000 (22:33 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1 am:
af369f6e66 am:
d610363a48
am:
0777ad8253
Change-Id: I9403ca33c0b87ca1ca01f2ce5209c12332b01e51
David Christie [Wed, 24 Aug 2016 22:33:37 +0000 (22:33 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev am:
975879a18d am:
dd1016c619
am:
3aaac55e70
Change-Id: I01b09466d9993f28de5c95a7d21555b3be112891
David Christie [Wed, 24 Aug 2016 22:30:20 +0000 (22:30 +0000)]
resolve merge conflicts of
a2399b4 to mnc-dev am:
6195acc2b5 am:
e24eb2dbb5
am:
362668b6f7
Change-Id: I019f76b45de78171ef888d2175dc9140be172784
Narayan Kamath [Wed, 24 Aug 2016 22:23:54 +0000 (22:23 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f am:
3c63bb367f am:
c11e8fcc04
am:
c01db7dca3
Change-Id: I056c33c5925a625b539df250af0fa7d48258b0f2
David Christie [Wed, 24 Aug 2016 22:23:52 +0000 (22:23 +0000)]
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
David Christie [Wed, 24 Aug 2016 22:23:49 +0000 (22:23 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1 am:
af369f6e66
am:
d610363a48
Change-Id: I186b4bedcf057489deca1e161a052619ce594e56
David Christie [Wed, 24 Aug 2016 22:23:46 +0000 (22:23 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev am:
975879a18d
am:
dd1016c619
Change-Id: I54910f6c22b69b029be80007cdbf06b203886398
David Christie [Wed, 24 Aug 2016 22:23:42 +0000 (22:23 +0000)]
resolve merge conflicts of
a2399b4 to mnc-dev am:
6195acc2b5
am:
e24eb2dbb5
Change-Id: Idb6cbe8c16877301aed50faed41fa0390db3cf10
David Christie [Wed, 24 Aug 2016 22:16:07 +0000 (22:16 +0000)]
resolve merge conflicts of
a2399b4 to mnc-dev
am:
6195acc2b5
Change-Id: I34c3133924af9906b88ebd5faf78e0c000aa05be
Narayan Kamath [Wed, 24 Aug 2016 22:14:36 +0000 (22:14 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f am:
3c63bb367f
am:
c11e8fcc04
Change-Id: Idd314c1e12919d8cbaf9e71d72519d34d18e6f01
David Christie [Wed, 24 Aug 2016 22:14:32 +0000 (22:14 +0000)]
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
David Christie [Wed, 24 Aug 2016 22:14:28 +0000 (22:14 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1
am:
af369f6e66
Change-Id: I6973f8f1053644548062b94c1696c123f47f0ad4
David Christie [Wed, 24 Aug 2016 22:14:24 +0000 (22:14 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev
am:
975879a18d
Change-Id: Icf81e5ce2bc02750d66b13feedfc098dd9374167
David Christie [Wed, 24 Aug 2016 20:47:57 +0000 (13:47 -0700)]
resolve merge conflicts of
a2399b4 to mnc-dev
Change-Id: Ifc9e13cdb047ef70799ba8b1b9e91357ef5f2d2a
Narayan Kamath [Wed, 24 Aug 2016 20:30:13 +0000 (20:30 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284 am:
b85e9e9108 am:
b56f4f53e1 -s ours am:
2984748753 am:
b9fae65605
am:
c6c7ca0cde
Change-Id: Ifca9f825dac758c653560c41b81a13bd13c9fd4c
Narayan Kamath [Wed, 24 Aug 2016 20:30:09 +0000 (20:30 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f
am:
3c63bb367f
Change-Id: Iaa5ba9f3fcc28da14b60dc489e49bd177d2bfcb3
David Christie [Wed, 24 Aug 2016 20:30:06 +0000 (20:30 +0000)]
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
David Christie [Wed, 24 Aug 2016 20:30:01 +0000 (20:30 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24
am:
41a0dd41f1
Change-Id: Ib74b0efa9b9345257d2b3ba59911baa324ec5801
Salvador Martinez [Wed, 24 Aug 2016 18:17:38 +0000 (18:17 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev
TreeHugger Robot [Wed, 24 Aug 2016 17:27:07 +0000 (17:27 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
Salvador Martinez [Thu, 4 Aug 2016 20:37:52 +0000 (13:37 -0700)]
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)
David Christie [Tue, 23 Aug 2016 23:19:51 +0000 (16:19 -0700)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev
Change-Id: Ic44c577ef364bf81dd1e30b50c71718d4910eb10
Julius D'souza [Tue, 23 Aug 2016 16:52:24 +0000 (16:52 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am:
3275a3a5a5 -s ours
am:
d5bf4039a9 -s ours
Change-Id: I4f1a0acabe5d5385af086791b906ff6f45424e59
Julius D'souza [Tue, 23 Aug 2016 16:45:41 +0000 (16:45 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
am:
3275a3a5a5 -s ours
Change-Id: Iaae7763a4d744ad8a63538750c5ed3efe38161d5
Scott Main [Tue, 23 Aug 2016 15:42:01 +0000 (15:42 +0000)]
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev
Yang Ni [Wed, 29 Jun 2016 19:44:06 +0000 (12:44 -0700)]
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
Alan Viverette [Wed, 27 Jul 2016 14:23:35 +0000 (10:23 -0400)]
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)
Julius D'souza [Mon, 8 Aug 2016 02:08:30 +0000 (19:08 -0700)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
Bug:
18572096
Change-Id: Ie0ff1990b8f4a3d435328834871f04a6e2bd5e97
Dirk Dougherty [Mon, 22 Aug 2016 06:41:37 +0000 (23:41 -0700)]
Doc change: intl page updates for final n release.
Change-Id: I11445717cf49438ba5a04b50245209161740d4b0
Dirk Dougherty [Thu, 18 Aug 2016 02:09:14 +0000 (19:09 -0700)]
Doc change: updates for final N landing page and related resources.
Change-Id: Ieeb3dd74a889d6c0118e4ca8575abdaddcde7e73
David Friedman [Fri, 19 Aug 2016 21:17:54 +0000 (21:17 +0000)]
Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev
David Friedman [Fri, 19 Aug 2016 21:16:52 +0000 (21:16 +0000)]
Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev
Jim Miller [Fri, 19 Aug 2016 20:23:50 +0000 (20:23 +0000)]
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
Jim Miller [Fri, 19 Aug 2016 20:23:45 +0000 (20:23 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2 am:
9f04985991
am:
85c390e9fb -s ours
Change-Id: I07ac3fe88dd7acc7ced6b4483d98efe1797bea21
Jim Miller [Fri, 19 Aug 2016 20:16:37 +0000 (20:16 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am:
02e9affa42
am:
ddf70b9195
Change-Id: I8308733be4ac586377b0545057dbf982875e4da5
Jim Miller [Fri, 19 Aug 2016 20:16:34 +0000 (20:16 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2
am:
9f04985991
Change-Id: Iff24a78b5a4b4de9b866105fbce2a181125b771e
Jim Miller [Fri, 19 Aug 2016 20:09:43 +0000 (20:09 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
am:
02e9affa42
Change-Id: I2da2738345bc63e1f40f8f9d6e8215b770cc93b4
Jim Miller [Fri, 19 Aug 2016 20:09:41 +0000 (20:09 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE
am:
b6f4b48df2
Change-Id: Ib70a6f9f82eef19724f6dd83fdefec59a29d0cab
TreeHugger Robot [Fri, 19 Aug 2016 20:03:46 +0000 (20:03 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
David Friedman [Thu, 18 Aug 2016 01:23:23 +0000 (18:23 -0700)]
Docs: Adds a redirect to make it easier to access Performance section on DAC.
d.android.com/performance will now take you to d.android.com/topic/performance
Change-Id: I56bc85f156a9cb05a664fbf361eb5b99e153b419
David Friedman [Fri, 5 Aug 2016 00:55:52 +0000 (17:55 -0700)]
Docs: Adding information to Building-for-Billions landing page.
Bug:
30700934
Change-Id: I6d6ffafd674340e15e32c04a8bf08ba7fec402a8
Sudheer Shanka [Fri, 19 Aug 2016 18:02:26 +0000 (18:02 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5 am:
08eb52f9f9
am:
58def3804c -s ours
Change-Id: I83e7f1e64a965a7550629d2a891445dab11a8d8d
Amith Yamasani [Fri, 19 Aug 2016 18:02:22 +0000 (18:02 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27 am:
39c7879365
am:
5841c492a7 -s ours
Change-Id: Ia483fee611b51ad0187b625c62d32877e73ff551
Sudheer Shanka [Fri, 19 Aug 2016 17:54:21 +0000 (17:54 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5
am:
08eb52f9f9
Change-Id: Ica347f4059b4fbe8f822a963b47df0cbe7c646ba
Amith Yamasani [Fri, 19 Aug 2016 17:54:19 +0000 (17:54 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27
am:
39c7879365
Change-Id: I36e3a9a580c73dc61b5de35740bc4d7206a6e0b7
Sudheer Shanka [Fri, 19 Aug 2016 17:32:47 +0000 (17:32 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb
am:
7e890c8eb5
Change-Id: I53be9e220d21f4322f930f3ee9095d8fa43ef2d6
Amith Yamasani [Fri, 19 Aug 2016 17:32:44 +0000 (17:32 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4
am:
29ae7b1a27
Change-Id: Ia37f8295ee5843412cf4045764b469ee48608f07
Sudheer Shanka [Fri, 19 Aug 2016 17:22:29 +0000 (17:22 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
am:
b51e98becb
Change-Id: I16fab19d30345e14076fda71d1d821539ceb70d2
Amith Yamasani [Fri, 19 Aug 2016 17:22:25 +0000 (17:22 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
d1eeb5b7b4
Change-Id: I2d4df3c6f766c38b78af5598bbd15e40a88381ff
Sudheer Shanka [Fri, 19 Aug 2016 17:06:53 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
Sudheer Shanka [Fri, 19 Aug 2016 17:06:47 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev
Jim Miller [Fri, 19 Aug 2016 03:22:33 +0000 (20:22 -0700)]
Bind fingerprint when we start authentication - DO NOT MERGE
This fixes a bug where it was possible to authenticate the wrong user.
We now bind the userId when we start authentication and confirm it when
authentication completes.
Fixes bug
30744668
Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2
Scott Main [Fri, 19 Aug 2016 01:04:01 +0000 (01:04 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev
smain@google.com [Thu, 18 Aug 2016 21:41:47 +0000 (14:41 -0700)]
fix redirect for AIDL doc
bug:
5967288
Change-Id: Ia2a4cbdde56d2e6baca4c5f74ea92bb7bfaf2938
Narayan Kamath [Thu, 18 Aug 2016 10:30:00 +0000 (10:30 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2 am:
8fdee85e87 am:
4cf5241f47 am:
efab128e67
am:
86437ec433
Change-Id: If18135c4aebd55fa9a1f08e275dbfef3dc433b5e
Narayan Kamath [Thu, 18 Aug 2016 10:29:55 +0000 (10:29 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284 am:
b85e9e9108 am:
b56f4f53e1 -s ours am:
2984748753
am:
b9fae65605
Change-Id: I3df204c005d61091f83e6ee2bd6bcd2a63a68c2b
Narayan Kamath [Thu, 18 Aug 2016 10:23:23 +0000 (10:23 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2 am:
8fdee85e87 am:
4cf5241f47
am:
efab128e67
Change-Id: I7159b2996f35311a630cdb7b2646c0e94d159c1f
Narayan Kamath [Thu, 18 Aug 2016 10:23:20 +0000 (10:23 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284 am:
b85e9e9108 am:
b56f4f53e1 -s ours
am:
2984748753
Change-Id: Id9f73afcbc747e3e341c5cfa665e4929747fdbac
Narayan Kamath [Thu, 18 Aug 2016 10:19:28 +0000 (10:19 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2 am:
8fdee85e87
am:
4cf5241f47
Change-Id: Ibd736c16c8af9397e774c5abb917a9a3d31681a0
Narayan Kamath [Thu, 18 Aug 2016 10:16:48 +0000 (10:16 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284 am:
b85e9e9108
am:
b56f4f53e1 -s ours
Change-Id: I67e1ff67c88d8c70a9d6d0698c857be77f09f534
Narayan Kamath [Thu, 18 Aug 2016 10:14:29 +0000 (10:14 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
Narayan Kamath [Thu, 18 Aug 2016 09:58:45 +0000 (09:58 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0
am:
1bd43c162f
Change-Id: Ic38c43db48584b3d899e120fd65a4058d806a39f
Narayan Kamath [Thu, 18 Aug 2016 09:56:29 +0000 (09:56 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2
am:
8fdee85e87
Change-Id: I654191bebb88a8005e9f46ad8b8b1f932214b3c9
Narayan Kamath [Thu, 18 Aug 2016 09:56:24 +0000 (09:56 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284
am:
b85e9e9108
Change-Id: Ie4874c088e05f4f5bc2073661010d413e60b3f7b
Narayan Kamath [Thu, 18 Aug 2016 09:53:12 +0000 (09:53 +0000)]
Process: Fix communication with zygote.
am:
e29c6493c0
Change-Id: I86b073f7f69943911aa0bea782e29ae6d86609a2
Narayan Kamath [Thu, 18 Aug 2016 09:50:56 +0000 (09:50 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev
am:
6829cf28e2
Change-Id: I740364ba90a8d1f14a5b2d2aacfe44948a4583d2
Narayan Kamath [Thu, 18 Aug 2016 09:50:52 +0000 (09:50 +0000)]
Process: Fix communication with zygote.
am:
8e69dd2284
Change-Id: I3860d3f66e256a6446df5d8ce20f752d1c002e0f
Narayan Kamath [Thu, 18 Aug 2016 09:46:17 +0000 (09:46 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev
smain@google.com [Wed, 17 Aug 2016 23:17:11 +0000 (16:17 -0700)]
add workaround for annotations dependency conflict with espresso
Change-Id: Ia5f06e35b034d207f19d061b27ddbecd66012130
Jim Miller [Wed, 17 Aug 2016 23:22:33 +0000 (23:22 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c am:
229de7088e
am:
cb83f6188b
Change-Id: I82302931ab714e25ec21721dc05480e1f2d447b0
Jim Miller [Wed, 17 Aug 2016 23:15:43 +0000 (23:15 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c
am:
229de7088e
Change-Id: I8e9d946f96933c1338261d8adf80156cb67d3ba1
Jim Miller [Wed, 17 Aug 2016 23:07:46 +0000 (23:07 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13
am:
485fbda04c
Change-Id: I07def32199ecdbbb32aa6ecaca20724cfc81265c
Jim Miller [Wed, 17 Aug 2016 22:59:27 +0000 (22:59 +0000)]
Fix vulnerability in LockSettings service
am:
2d71384a13
Change-Id: I62ca5fb150022fe0971329294b1063957f397248
Dirk Dougherty [Wed, 17 Aug 2016 22:53:23 +0000 (22:53 +0000)]
Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev
Hemal Patel [Wed, 17 Aug 2016 20:18:14 +0000 (13:18 -0700)]
Docs: Fixed the Bluetooth guide link
Fixed the link that points to the Bluetooth guide.
Bug:
29268546
Change-Id: I51c48cebf45c78481f8853a93ff7bcd8483d69ba
Hemal Patel [Wed, 17 Aug 2016 19:37:17 +0000 (19:37 +0000)]
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs
am:
c7902aa4bb
Change-Id: I45943e80b869adc9017b0e8de116f10e3b710764
Hemal Patel [Wed, 17 Aug 2016 19:37:14 +0000 (19:37 +0000)]
Docs: Renamed Google Now to Google Voice Actions
am:
86bbfaabdd
Change-Id: If177e10f331ca5ade62005337956b0fa81a90f26
Hemal Patel [Wed, 17 Aug 2016 19:32:15 +0000 (19:32 +0000)]
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs
Andrew Solovay [Wed, 17 Aug 2016 17:48:47 +0000 (17:48 +0000)]
docs: Docs for Support Library 24.2.0 release
am:
085994c40d
Change-Id: I7e69bf585d342f1075856673e52ff15207be4a1c
Eric Schmidt [Wed, 17 Aug 2016 17:14:11 +0000 (17:14 +0000)]
docs: Fixed code snippet in notify-user/navigation.html
am:
32cc6b7fb7
Change-Id: I43cf6d188bac5cc5b3d0894915ff431e13156cd5
Dirk Dougherty [Tue, 14 Jun 2016 23:26:28 +0000 (16:26 -0700)]
dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links.
Change-Id: I7d26fabfca74d8e706fd99cbeaa1761907c31dbf