OSDN Git Service
Julia Reynolds [Tue, 9 Aug 2016 19:52:29 +0000 (19:52 +0000)]
Clean up zen rules and permissions immediately on uninstall. am:
6434eb2e04 am:
eaf9974125
am:
7f7b7d5a14
Change-Id: I9def8ae9cf7ba374314a20e74270426b2c2a2377
Julia Reynolds [Tue, 9 Aug 2016 19:38:17 +0000 (19:38 +0000)]
Clean up zen rules and permissions immediately on uninstall. am:
6434eb2e04
am:
eaf9974125
Change-Id: I80252835f84de0fc22491c5aa95595819c0d945c
Wale Ogunwale [Tue, 9 Aug 2016 19:35:46 +0000 (19:35 +0000)]
Merge "Limit number of recents entries for an app to maxRecents allowed." into nyc-mr1-dev am:
6529ab20fb am:
7a5f1d8cd9
am:
4ea242a3c0
Change-Id: I6b8fdf80367150567aad148b726bcb87a2a0e843
Wale Ogunwale [Tue, 9 Aug 2016 19:35:43 +0000 (19:35 +0000)]
Limit number of recents entries for an app to maxRecents allowed. am:
847167fe3d am:
9d0ce42620
am:
cb2338446e
Change-Id: I813e282ab28ab976841cc85c9c60ad4a22359e11
Julia Reynolds [Tue, 9 Aug 2016 19:10:43 +0000 (19:10 +0000)]
Clean up zen rules and permissions immediately on uninstall.
am:
6434eb2e04
Change-Id: Id9c534ec4226f341909e151c6703b23b6c7b9af9
Wale Ogunwale [Tue, 9 Aug 2016 19:05:12 +0000 (19:05 +0000)]
Merge "Limit number of recents entries for an app to maxRecents allowed." into nyc-mr1-dev am:
6529ab20fb
am:
7a5f1d8cd9
Change-Id: Ifde90d35b30bff88cca35136dfff9507d59d1541
Wale Ogunwale [Tue, 9 Aug 2016 19:05:09 +0000 (19:05 +0000)]
Limit number of recents entries for an app to maxRecents allowed. am:
847167fe3d
am:
9d0ce42620
Change-Id: I8f88fff25f11f1605c020089dadad687b756c2ba
Yi Kong [Tue, 9 Aug 2016 19:02:08 +0000 (19:02 +0000)]
Merge "Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7" am:
67aaa079ee am:
2ae4d32ca3 am:
e89e884b47
am:
236bd43dfe
Change-Id: Ie4c447de32c1834121188273ad6cf581a2f2a01b
Wale Ogunwale [Tue, 9 Aug 2016 18:54:26 +0000 (18:54 +0000)]
Merge "Limit number of recents entries for an app to maxRecents allowed." into nyc-mr1-dev
am:
6529ab20fb
Change-Id: Ic38e99f4e4fc04e4d94212ae0c4fd70f5d3352f7
Wale Ogunwale [Tue, 9 Aug 2016 18:54:24 +0000 (18:54 +0000)]
Limit number of recents entries for an app to maxRecents allowed.
am:
847167fe3d
Change-Id: Ib97c8226fc18de59802aacd55b161a3188cab5b8
Yi Kong [Tue, 9 Aug 2016 18:26:15 +0000 (18:26 +0000)]
Merge "Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7" am:
67aaa079ee am:
2ae4d32ca3
am:
e89e884b47
Change-Id: I66f22f99f5552a46cc269b6ef28f5ac37d805505
Yi Kong [Tue, 9 Aug 2016 18:25:18 +0000 (18:25 +0000)]
Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7 am:
19df48b93b am:
d5e8edfe1d
am:
410c8b9f48
Change-Id: I2913d01d63e070b3de85fec489bb3803e403fa52
TreeHugger Robot [Tue, 9 Aug 2016 18:25:02 +0000 (18:25 +0000)]
Merge "Limit number of recents entries for an app to maxRecents allowed." into nyc-mr1-dev
Yi Kong [Tue, 9 Aug 2016 18:19:09 +0000 (18:19 +0000)]
Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7 am:
19df48b93b
am:
d5e8edfe1d
Change-Id: I084e1057aa51a908d24b19d47ff6747e18494507
Yi Kong [Tue, 9 Aug 2016 18:15:56 +0000 (18:15 +0000)]
Merge "Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7" am:
67aaa079ee
am:
2ae4d32ca3
Change-Id: I279138f6f7d585b2358537f129561d04c531dd00
Yi Kong [Tue, 9 Aug 2016 18:07:29 +0000 (18:07 +0000)]
Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7
am:
19df48b93b
Change-Id: I7fba48c95191b4a53acff70e89d59e30d3eb8e90
Yi Kong [Tue, 9 Aug 2016 18:07:12 +0000 (18:07 +0000)]
Merge "Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7"
am:
67aaa079ee
Change-Id: I8b0bb02aca968de0baa7864cf4e123e4dd60b594
Matthew Tait [Tue, 9 Aug 2016 18:04:28 +0000 (18:04 +0000)]
Merge "Fixes date and time picker to use integer values" into cw-f-dev am:
59b829426d
am:
59f3c3f7a0
Change-Id: I730c895602fbae4b8821195a7c98077cb4f19e71
Matthew Tait [Tue, 9 Aug 2016 18:04:24 +0000 (18:04 +0000)]
Fixes date and time picker to use integer values am:
7a323e2eff
am:
96160e8506
Change-Id: I1ff6cc9f144022a3fec78ff4440f061bfe3c05b9
Yi Kong [Tue, 9 Aug 2016 17:59:07 +0000 (17:59 +0000)]
Yi Kong [Tue, 9 Aug 2016 13:58:57 +0000 (14:58 +0100)]
Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
(cherry picked from commit
f646aa14cdbf34e8784c0411d0baca26e364c1dc)
Matthew Tait [Tue, 9 Aug 2016 17:56:08 +0000 (17:56 +0000)]
Merge "Fixes date and time picker to use integer values" into cw-f-dev
am:
59b829426d
Change-Id: Ie89113a5a5fb86fea8e9f422f4f755c48d827196
Matthew Tait [Tue, 9 Aug 2016 17:56:05 +0000 (17:56 +0000)]
Fixes date and time picker to use integer values
am:
7a323e2eff
Change-Id: Ib07d0497e54ca717babfa07d98782a73cb0981b6
Matthew Tait [Tue, 9 Aug 2016 17:47:07 +0000 (17:47 +0000)]
Merge "Fixes date and time picker to use integer values" into cw-f-dev
Matthew Tait [Tue, 9 Aug 2016 16:54:11 +0000 (17:54 +0100)]
Fixes date and time picker to use integer values
bug:
30676304
Change-Id: Ieb1f059153219d7e4fcd29afd38333fcc6448d25
Geoffrey Pitsch [Tue, 9 Aug 2016 17:31:09 +0000 (17:31 +0000)]
Merge "BootAnimation system property to play sound." into nyc-mr1-dev am:
3025e6be7f am:
86a0009ccb
am:
8fe278eab6
Change-Id: I926cafe2072908c202a2893ae1e25bf22f2378af
Geoffrey Pitsch [Tue, 9 Aug 2016 17:31:06 +0000 (17:31 +0000)]
BootAnimation system property to play sound. am:
305087991d am:
8e4b8a988f
am:
5e8bb86e8c
Change-Id: Ibcf73b3245b63492c1feaa1494271c181c86c59e
Geoffrey Pitsch [Tue, 9 Aug 2016 17:22:54 +0000 (17:22 +0000)]
Merge "BootAnimation system property to play sound." into nyc-mr1-dev am:
3025e6be7f
am:
86a0009ccb
Change-Id: I3ad654d36e6b4d9a946630cf5777e1695db58151
Geoffrey Pitsch [Tue, 9 Aug 2016 17:22:51 +0000 (17:22 +0000)]
BootAnimation system property to play sound. am:
305087991d
am:
8e4b8a988f
Change-Id: Icd062a5b3eb9da9d9c7bd3c5d7dd4e40f75c3a1e
Geoffrey Pitsch [Tue, 9 Aug 2016 17:16:10 +0000 (17:16 +0000)]
Merge "BootAnimation system property to play sound." into nyc-mr1-dev
am:
3025e6be7f
Change-Id: I1cce85ae51f41d22cfb3fb2ff0f708f0b6ae43c1
Geoffrey Pitsch [Tue, 9 Aug 2016 17:16:04 +0000 (17:16 +0000)]
BootAnimation system property to play sound.
am:
305087991d
Change-Id: I1e6e42828340b9656354952f09f6fbf95621e524
Geoffrey Pitsch [Tue, 9 Aug 2016 17:08:54 +0000 (17:08 +0000)]
Merge "BootAnimation system property to play sound." into nyc-mr1-dev
Julia Reynolds [Mon, 8 Aug 2016 21:19:26 +0000 (17:19 -0400)]
Clean up zen rules and permissions immediately on uninstall.
Change-Id: I8d03f4a4347b7d7bffbe267961c75ed5863a4113
Fixes:
30740759
Yi Kong [Tue, 9 Aug 2016 13:58:57 +0000 (14:58 +0100)]
Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
Neil Fuller [Tue, 9 Aug 2016 16:38:55 +0000 (16:38 +0000)]
Merge "Tidy up MockWebServer usage" am:
294ab080f4 am:
d0dc901341 am:
47eedc3503
am:
cfc82ac074
Change-Id: I9a27fe8d2769efee97e2d5be719d783ac1a34de1
Neil Fuller [Tue, 9 Aug 2016 16:32:52 +0000 (16:32 +0000)]
Merge "Tidy up MockWebServer usage" am:
294ab080f4 am:
d0dc901341
am:
47eedc3503
Change-Id: I96d3b4b5b7123bbbcac58d5838985c618fa9122e
Wale Ogunwale [Tue, 9 Aug 2016 16:21:10 +0000 (09:21 -0700)]
Limit number of recents entries for an app to maxRecents allowed.
Regression in the API caused by the fixes for b/
28293748 and b/
25460953
which prevented the task entries from been trimmed if the task don't
have the same intent filter (additional documents launched will normally
have different intent action/filter than the base activity) or it allows
multiple task entries.
We now trim when we go over the maxRecents allowed in both cases.
Bug:
30645949
Bug:
28293748
Bug:
25460953
Change-Id: I74c8ecc38f72a5d03c213dea8d3e62261d42f8f6
Neil Fuller [Tue, 9 Aug 2016 16:26:46 +0000 (16:26 +0000)]
Merge "Tidy up MockWebServer usage" am:
294ab080f4
am:
d0dc901341
Change-Id: I611d9e21a8e70e2e99de078e5218e34961cf7ee7
Neil Fuller [Tue, 9 Aug 2016 16:16:54 +0000 (16:16 +0000)]
Merge "Tidy up MockWebServer usage"
am:
294ab080f4
Change-Id: Ia22ce1e949ba3b611c0f2be60b3dbbafef7e4bb6
TreeHugger Robot [Tue, 9 Aug 2016 16:16:17 +0000 (16:16 +0000)]
Merge "Cancel dialog before stopping service."
Neil Fuller [Tue, 9 Aug 2016 16:05:38 +0000 (16:05 +0000)]
Merge "Tidy up MockWebServer usage"
Neil Fuller [Tue, 9 Aug 2016 11:07:17 +0000 (11:07 +0000)]
Merge "Add a finalize() method to StrictJarFile" am:
d0c0c8dcab am:
2ffb7ebae2 am:
f952f52013
am:
ce78eb6b45
Change-Id: Ic622fe2adabfed18a6481f8d32685e37f3fe24b0
Neil Fuller [Tue, 9 Aug 2016 11:02:07 +0000 (11:02 +0000)]
Merge "Add a finalize() method to StrictJarFile" am:
d0c0c8dcab am:
2ffb7ebae2
am:
f952f52013
Change-Id: I0a621a83670f326d218fe3f77bc5fe9bbad6ea6c
Neil Fuller [Tue, 9 Aug 2016 10:54:32 +0000 (10:54 +0000)]
Merge "Add a finalize() method to StrictJarFile" am:
d0c0c8dcab
am:
2ffb7ebae2
Change-Id: Ie947e8447ecd8e9a61b6d1115174180e41d74311
TreeHugger Robot [Tue, 9 Aug 2016 10:50:16 +0000 (10:50 +0000)]
Merge "Introduce TextPaint.measureText performance tests."
Neil Fuller [Tue, 9 Aug 2016 10:49:58 +0000 (10:49 +0000)]
Merge "Add a finalize() method to StrictJarFile"
am:
d0c0c8dcab
Change-Id: Iccab49c98b105aff6105e21274fbc099d10ecb55
Neil Fuller [Tue, 9 Aug 2016 10:43:18 +0000 (10:43 +0000)]
Merge "Add a finalize() method to StrictJarFile"
Seigo Nonaka [Wed, 3 Aug 2016 08:28:36 +0000 (17:28 +0900)]
Introduce TextPaint.measureText performance tests.
Bug:
29142734
Change-Id: I0e3d14fe8be728d47223d16316a628ebb25f834f
Tobias Thierer [Tue, 9 Aug 2016 09:18:25 +0000 (09:18 +0000)]
Merge "Ensure apps cannot prevent uncaught exceptions being logged." am:
f61a449ee9 am:
8431c55fb8 am:
62360649c8
am:
1c47ebcf84
Change-Id: I7dce05184017dc221f021423acb4215de0a157f4
Tobias Thierer [Tue, 9 Aug 2016 09:12:51 +0000 (09:12 +0000)]
Merge "Ensure apps cannot prevent uncaught exceptions being logged." am:
f61a449ee9 am:
8431c55fb8
am:
62360649c8
Change-Id: I5ab8894481e32ee2c4f40439d920facd095ac952
Tobias Thierer [Tue, 9 Aug 2016 09:07:43 +0000 (09:07 +0000)]
Merge "Ensure apps cannot prevent uncaught exceptions being logged." am:
f61a449ee9
am:
8431c55fb8
Change-Id: I9b75016ac643c5bab03589ec82a4946fc2d9720e
Tobias Thierer [Tue, 9 Aug 2016 09:02:27 +0000 (09:02 +0000)]
Merge "Ensure apps cannot prevent uncaught exceptions being logged."
am:
f61a449ee9
Change-Id: I826c175547a73123cd438ebe6991efee39a433d0
Tobias Thierer [Tue, 9 Aug 2016 08:55:34 +0000 (08:55 +0000)]
Merge "Ensure apps cannot prevent uncaught exceptions being logged."
Sara Kato [Tue, 9 Aug 2016 08:26:19 +0000 (08:26 +0000)]
Merge "Add test doubleTapAndDragToSelect_multiLine"
Sara Kato [Tue, 9 Aug 2016 05:40:45 +0000 (14:40 +0900)]
Add test doubleTapAndDragToSelect_multiLine
Bug:
30687230
Change-Id: I260c641544f69768f0b8f6cf10d51724e7a7b3c3
TreeHugger Robot [Tue, 9 Aug 2016 01:31:28 +0000 (01:31 +0000)]
Merge "Kill service before trying to cancel notifications."
Felipe Leme [Tue, 9 Aug 2016 00:17:52 +0000 (17:17 -0700)]
Cancel dialog before stopping service.
Fixes:
30746086
Change-Id: Iea8a197a2785259dd80aa8130d79ded484562826
Christopher Tate [Tue, 9 Aug 2016 00:56:44 +0000 (00:56 +0000)]
Merge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev am:
0b26adbb8b am:
c32929ab1a
am:
0c4497e7be
Change-Id: Ifb94e4471267b3c89ec591a45b8b091227713458
Christopher Tate [Tue, 9 Aug 2016 00:56:39 +0000 (00:56 +0000)]
Handle empty/unspecified crop properly in wallpaper restore am:
dd7110db2b am:
2ba9127494
am:
fbee390c97
Change-Id: I497c9254951537b118d6fee81725f303bd37c7a1
Christopher Tate [Tue, 9 Aug 2016 00:51:21 +0000 (00:51 +0000)]
Merge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev am:
d5b0b9bb1f am:
dacbfeaa4c
am:
ecab26e47f
Change-Id: I2889aa0312049527e816927bf2fee61214891275
Christopher Tate [Tue, 9 Aug 2016 00:51:16 +0000 (00:51 +0000)]
Merge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev am:
0b26adbb8b
am:
c32929ab1a
Change-Id: I5713bd059a0fa6c5ed49cd5523082263bf17e19b
Christopher Tate [Tue, 9 Aug 2016 00:51:15 +0000 (00:51 +0000)]
Mark wallpaper as backupInForeground="true" am:
8f4c82691a am:
641bd536e3
am:
62bf877344
Change-Id: I1ffc489ef889bd48f1949e810d22ad36973db358
Christopher Tate [Tue, 9 Aug 2016 00:51:08 +0000 (00:51 +0000)]
Handle empty/unspecified crop properly in wallpaper restore am:
dd7110db2b
am:
2ba9127494
Change-Id: I7644603b3ff7dcbd0c9b43cc170da19172949d15
Christopher Tate [Tue, 9 Aug 2016 00:43:33 +0000 (00:43 +0000)]
Merge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev am:
d5b0b9bb1f
am:
dacbfeaa4c
Change-Id: Icfd874132ee26287e7d1b3e8e40ec9e1897a19a1
Christopher Tate [Tue, 9 Aug 2016 00:43:29 +0000 (00:43 +0000)]
Mark wallpaper as backupInForeground="true" am:
8f4c82691a
am:
641bd536e3
Change-Id: I3b2ceb7646a3332998782bf8bffff34e2c98191e
Christopher Tate [Tue, 9 Aug 2016 00:43:18 +0000 (00:43 +0000)]
Merge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev
am:
0b26adbb8b
Change-Id: Ic7b8e2dc5bf39553b1036fad8e871b5fdb51c74f
Christopher Tate [Tue, 9 Aug 2016 00:43:16 +0000 (00:43 +0000)]
Handle empty/unspecified crop properly in wallpaper restore
am:
dd7110db2b
Change-Id: I501a5e30a1b204436e722d363709d3d35d430d91
Christopher Tate [Tue, 9 Aug 2016 00:37:12 +0000 (00:37 +0000)]
Merge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev
am:
d5b0b9bb1f
Change-Id: I7c12efa23f81cad90cad9735c54c80fbdd4641dd
Christopher Tate [Tue, 9 Aug 2016 00:37:10 +0000 (00:37 +0000)]
Mark wallpaper as backupInForeground="true"
am:
8f4c82691a
Change-Id: Idf7e60a44496584075a8f8f7b7958278f65439e3
TreeHugger Robot [Tue, 9 Aug 2016 00:34:07 +0000 (00:34 +0000)]
Merge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev
TreeHugger Robot [Tue, 9 Aug 2016 00:24:04 +0000 (00:24 +0000)]
Merge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev
Kevin Hufnagle [Tue, 9 Aug 2016 00:22:56 +0000 (00:22 +0000)]
Merge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am:
87c2ed97b8" into nyc-mr1-dev am:
0402936230 am:
b5f0030c36
am:
af31bcc7b9
Change-Id: I14a1d3b335202f63d22bc4c7b4025c7f089f0c25
Kevin Hufnagle [Tue, 9 Aug 2016 00:20:29 +0000 (00:20 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am:
87c2ed97b8 am:
70f8ca8dff am:
3ded4c5774
am:
75f0d1e2ff
Change-Id: I178a33e258cc643c8d42798fdda8f5fe08375d61
Kevin Hufnagle [Tue, 9 Aug 2016 00:20:22 +0000 (00:20 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page. am:
d4197234bb" into nyc-mr1-dev am:
fc9f55873a am:
7c2d0c77a6
am:
a183521170
Change-Id: I13dfd1b4095cf49f346231fc801868488e77abba
Kevin Hufnagle [Tue, 9 Aug 2016 00:20:18 +0000 (00:20 +0000)]
docs: Revised "Optimizing Content for the Assistant" page. am:
d4197234bb am:
7a13b16dcf am:
bbedca69e5
am:
8c1a8c7d31
Change-Id: I3af6c4523ed335aac3bb942205e93aa7c1ae4065
Chris Craik [Tue, 9 Aug 2016 00:20:15 +0000 (00:20 +0000)]
Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev am:
a9bef43149 am:
bbc56855bd
am:
e3a9f9b4e6
Change-Id: Iafc3a73f73b2d9a1e76b6a819632cfbeb504c209
Chris Craik [Tue, 9 Aug 2016 00:20:12 +0000 (00:20 +0000)]
Prevent EndLayerOps when Begin was rejected am:
3c53ec51ef am:
152f76ee50
am:
674965822b
Change-Id: Icfa8cb2ad7c97fdbbf37f01abe7b5a22f6b33cfd
Felipe Leme [Mon, 8 Aug 2016 22:39:13 +0000 (15:39 -0700)]
Kill service before trying to cancel notifications.
BUG:
30639703
Change-Id: Ib564371797e31e1dde37416efdb89641fb3024b1
Evan Rosky [Tue, 9 Aug 2016 00:12:48 +0000 (00:12 +0000)]
Merge "Fix build breakage caused by incomplete impl"
Kevin Hufnagle [Tue, 9 Aug 2016 00:10:14 +0000 (00:10 +0000)]
Merge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am:
87c2ed97b8" into nyc-mr1-dev am:
0402936230
am:
b5f0030c36
Change-Id: I23aeb14b55c0fcf45dbdea404f48ddc11eaa65f0
Evan Rosky [Tue, 9 Aug 2016 00:10:04 +0000 (17:10 -0700)]
Fix build breakage caused by incomplete impl
Change-Id: I32a8e0e5cb5209133e00dbc0589bc8b87f46260b
Kevin Hufnagle [Tue, 9 Aug 2016 00:07:25 +0000 (00:07 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am:
87c2ed97b8 am:
70f8ca8dff
am:
3ded4c5774
Change-Id: Id365a643e1ce22e82b090158cdc5456a1a3ae4ab
Kevin Hufnagle [Tue, 9 Aug 2016 00:07:16 +0000 (00:07 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page. am:
d4197234bb" into nyc-mr1-dev am:
fc9f55873a
am:
7c2d0c77a6
Change-Id: I68a73741db3c9c425588eea690aba788e0118fbf
Kevin Hufnagle [Tue, 9 Aug 2016 00:07:08 +0000 (00:07 +0000)]
docs: Revised "Optimizing Content for the Assistant" page. am:
d4197234bb am:
7a13b16dcf
am:
bbedca69e5
Change-Id: I5ca865bfe0c5c9302a930c91d770255bda224914
Kevin Hufnagle [Tue, 9 Aug 2016 00:07:03 +0000 (00:07 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am:
87c2ed97b8 am:
71b45d25df
am:
409ea2217a
Change-Id: I0b78fb840a88c9aa5791b242477de76970ae3ae5
Chris Craik [Tue, 9 Aug 2016 00:06:59 +0000 (00:06 +0000)]
Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev am:
a9bef43149
am:
bbc56855bd
Change-Id: I849382d12a565727f77240eda247e1e98ca3892c
Kevin Hufnagle [Tue, 9 Aug 2016 00:06:54 +0000 (00:06 +0000)]
docs: Revised "Optimizing Content for the Assistant" page. am:
d4197234bb am:
5d9f0520cb
am:
7e49a5f570
Change-Id: Ia9bce511a13caa754464e4e902d3664930c1ea80
Chris Craik [Tue, 9 Aug 2016 00:06:51 +0000 (00:06 +0000)]
Prevent EndLayerOps when Begin was rejected am:
3c53ec51ef
am:
152f76ee50
Change-Id: Id942f3b0495a4e3c9eb7aa6d8647987e72ddb77a
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:44 +0000 (23:57 +0000)]
Merge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am:
87c2ed97b8" into nyc-mr1-dev
am:
0402936230
Change-Id: Idb74051cc189752d2262ed0d49a483199a30c674
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:42 +0000 (23:57 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am:
87c2ed97b8
am:
70f8ca8dff
Change-Id: I8259ec45647b0ac035255ca8e3539fd4d1fe96c5
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:34 +0000 (23:57 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page. am:
d4197234bb" into nyc-mr1-dev
am:
fc9f55873a
Change-Id: Ifeca3dd4f1a3bfb9f77639c4ee02e0115888bedf
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:31 +0000 (23:57 +0000)]
docs: Revised "Optimizing Content for the Assistant" page. am:
d4197234bb
am:
7a13b16dcf
Change-Id: I484b8dba5b6dee2a15aa9dfad09b300761b1766e
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:28 +0000 (23:57 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am:
87c2ed97b8
am:
71b45d25df
Change-Id: I61828e5c4c0ca5386bba0789fadb1a927d29b2ec
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:26 +0000 (23:57 +0000)]
docs: Revised "Optimizing Content for the Assistant" page. am:
d4197234bb
am:
5d9f0520cb
Change-Id: I1a3de5fd2c50fc8071db932aaac697b6611c069d
Chris Craik [Mon, 8 Aug 2016 23:57:24 +0000 (23:57 +0000)]
Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev
am:
a9bef43149
Change-Id: Ie5049628f5e2f6f1e5baec0db92be30d3b1e2855
Chris Craik [Mon, 8 Aug 2016 23:57:22 +0000 (23:57 +0000)]
Prevent EndLayerOps when Begin was rejected
am:
3c53ec51ef
Change-Id: I075b68a1b7bdee4cbebd734748dd485ff6cd67b3
Android Build Merger (Role) [Mon, 8 Aug 2016 23:49:29 +0000 (23:49 +0000)]
Merge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am:
87c2ed97b8" into nyc-mr1-dev
Android Build Merger (Role) [Mon, 8 Aug 2016 23:49:18 +0000 (23:49 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page. am:
d4197234bb" into nyc-mr1-dev
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:52 +0000 (23:48 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
am:
87c2ed97b8
Change-Id: I48f91ef763f6591e16751d9ae8fd9d86be277111
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:50 +0000 (23:48 +0000)]
docs: Revised "Optimizing Content for the Assistant" page.
am:
d4197234bb
Change-Id: Ie85273ed977c06e9b82a77d66a7333e9eca86e10