OSDN Git Service
Hemal Patel [Tue, 9 Aug 2016 21:19:52 +0000 (21:19 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am:
5ca44906c6 am:
b6962dee09
am:
cae34dc577
Change-Id: I2ff827a50cb429cdc18b6b2a0fe2275693ebaf20
Hemal Patel [Tue, 9 Aug 2016 21:19:50 +0000 (21:19 +0000)]
Docs: Fixed the link that loads Fragments guide am:
a8e1c75bf6 am:
dabee01e9b
am:
3547fd0642
Change-Id: I325c16b92f193be2ff701da64e3896979441d6e7
Hemal Patel [Tue, 9 Aug 2016 21:19:47 +0000 (21:19 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am:
a70c722c77 am:
3c49a4b761
am:
57d3e1c9e1
Change-Id: I5913262cbc44ace40d084a608322658f2d3cd010
Hemal Patel [Tue, 9 Aug 2016 21:19:44 +0000 (21:19 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753 am:
ca17f5b8e3
am:
fbbb95ffbf
Change-Id: I0297e686573b191cb16049caf762b20a710eb53c
Hemal Patel [Tue, 9 Aug 2016 21:10:37 +0000 (21:10 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am:
5ca44906c6
am:
b6962dee09
Change-Id: Ifa4bcea1c47cfdfe00a36d8ad11c5aeaeeb71175
Hemal Patel [Tue, 9 Aug 2016 21:10:34 +0000 (21:10 +0000)]
Docs: Fixed the link that loads Fragments guide am:
a8e1c75bf6
am:
dabee01e9b
Change-Id: I6e3156f2990ddfd73b34015be8a09c972729d26e
Hemal Patel [Tue, 9 Aug 2016 21:10:28 +0000 (21:10 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am:
a70c722c77
am:
3c49a4b761
Change-Id: I81d45c0ddc35a34da756808ccfb89017b286f261
Hemal Patel [Tue, 9 Aug 2016 21:10:24 +0000 (21:10 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753
am:
ca17f5b8e3
Change-Id: Ic306fd462773e6b6b457a0f8c1ee4a5bd931be22
Hemal Patel [Tue, 9 Aug 2016 21:03:19 +0000 (21:03 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs
am:
5ca44906c6
Change-Id: I4286b4a8e0766f7c3ca2d7e5ebd5c9f2b296fbb9
Hemal Patel [Tue, 9 Aug 2016 21:03:13 +0000 (21:03 +0000)]
Docs: Fixed the link that loads Fragments guide
am:
a8e1c75bf6
Change-Id: I26ea32ff32067d86fb5390103eec737b293ac031
Hemal Patel [Tue, 9 Aug 2016 21:03:06 +0000 (21:03 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs
am:
a70c722c77
Change-Id: I6e1d0d70d5d4b89b083cb74272f064bebf6a273a
Hemal Patel [Tue, 9 Aug 2016 21:03:00 +0000 (21:03 +0000)]
Docs: Changed custom_toast to toast_layout
am:
3b7309d753
Change-Id: I3d85fb321e27643227c568127870c7ad07650c41
Hemal Patel [Tue, 9 Aug 2016 20:55:34 +0000 (20:55 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs
Hemal Patel [Tue, 9 Aug 2016 20:53:11 +0000 (20:53 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs
Chad Brubaker [Tue, 9 Aug 2016 19:59:10 +0000 (19:59 +0000)]
Merge "Add stub isCTVerificationRequired methods" am:
5b63231a31 am:
6e1f860c6a
am:
10943c69a2
Change-Id: I51870e48ab7519ef75e1a2643ab5af76918f46db
Shawn Willden [Tue, 9 Aug 2016 19:52:32 +0000 (19:52 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658 am:
7218af3f9a am:
58635e74ed
am:
c9974a889b
Change-Id: I0046859ca48a52a5e9cd1c32c44eb4917557edcc
Shawn Willden [Tue, 9 Aug 2016 19:52:25 +0000 (19:52 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09 am:
9e8b4ad9c9 am:
e5d71c4cfa
am:
0b90611069
Change-Id: I543ce45e581e3b12b5dde9b055e72b2b7a3ecd7c
Chad Brubaker [Tue, 9 Aug 2016 19:50:35 +0000 (19:50 +0000)]
Merge "Add stub isCTVerificationRequired methods" am:
5b63231a31
am:
6e1f860c6a
Change-Id: I5c1f4d9785e56777e37da614ed6515113ae277c1
Chad Brubaker [Tue, 9 Aug 2016 19:43:50 +0000 (19:43 +0000)]
Merge "Add stub isCTVerificationRequired methods"
am:
5b63231a31
Change-Id: Ica40dc0da1821aa47825e615f0f3b629e0358568
Shawn Willden [Tue, 9 Aug 2016 19:43:24 +0000 (19:43 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658 am:
7218af3f9a
am:
61f9b9227e
Change-Id: I8e6f93c62f9bba9ca6dbe2f838932e4c42c0c04c
Shawn Willden [Tue, 9 Aug 2016 19:43:17 +0000 (19:43 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09 am:
9e8b4ad9c9
am:
7f35a49d77
Change-Id: I2b86839143ed1419e5f5b025b785d33a600105c4
Shawn Willden [Tue, 9 Aug 2016 19:43:15 +0000 (19:43 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658 am:
7218af3f9a
am:
58635e74ed
Change-Id: Ie3ba00057e4b44c41520af58fd27dfbbb412f3ca
Shawn Willden [Tue, 9 Aug 2016 19:43:10 +0000 (19:43 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09 am:
9e8b4ad9c9
am:
e5d71c4cfa
Change-Id: I5b488b48ca27365bf4066acd1df4bc40a08660f1
Andrew Rossignol [Tue, 9 Aug 2016 19:38:36 +0000 (19:38 +0000)]
Merge "ContextHub: Avoid reference leaks" into cw-f-dev
am:
efdd4ac34b
Change-Id: I05f09b52140d307980c5fabfd0f7a2395d750340
Andrew Rossignol [Tue, 9 Aug 2016 19:38:31 +0000 (19:38 +0000)]
ContextHub: Avoid reference leaks
am:
52dda59896
Change-Id: I78df3e5c2f78684eb1ec5ac4f2781cf88b0fa2f2
Shawn Willden [Tue, 9 Aug 2016 19:38:25 +0000 (19:38 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658
am:
7218af3f9a
Change-Id: I8f350a045c1eb301418a91edfd975a388298507b
Julia Reynolds [Tue, 9 Aug 2016 19:38:25 +0000 (19:38 +0000)]
Merge "Clean up zen rules and permissions immediately on uninstall." into nyc-mr1-dev am:
6715c6abbd
am:
f5c030217f
Change-Id: I91d529e072d79aefda24a204ccd653e080a2697d
Shawn Willden [Tue, 9 Aug 2016 19:38:20 +0000 (19:38 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09
am:
9e8b4ad9c9
Change-Id: Ic680cc75dbe80b57876dae701551cacfe2022086
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
Shawn Willden [Tue, 9 Aug 2016 19:38:05 +0000 (19:38 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658
am:
7218af3f9a
Change-Id: I302b1dce1cff57b6f1cd5da3d6619984c80fde92
Shawn Willden [Tue, 9 Aug 2016 19:38:00 +0000 (19:38 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09
am:
9e8b4ad9c9
Change-Id: Iadb16bd13d4bb525805dd0266aea046c4c472309
Andrew Rossignol [Tue, 9 Aug 2016 19:17:31 +0000 (19:17 +0000)]
Merge "ContextHub: Avoid reference leaks" into cw-f-dev
Chad Brubaker [Tue, 9 Aug 2016 19:13:00 +0000 (19:13 +0000)]
Merge "Add stub isCTVerificationRequired methods"
Julia Reynolds [Tue, 9 Aug 2016 19:10:46 +0000 (19:10 +0000)]
Merge "Clean up zen rules and permissions immediately on uninstall." into nyc-mr1-dev
am:
6715c6abbd
Change-Id: I0d41f50144bb308f53c38ee4fa6e6d760adcb79e
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
Shawn Willden [Tue, 9 Aug 2016 19:01:04 +0000 (19:01 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs
am:
3188f77658
Change-Id: I4d30c3ad9f1d2d9d949e5f1ebc680f65c6925b99
Shawn Willden [Tue, 9 Aug 2016 19:01:00 +0000 (19:01 +0000)]
Fix @link tags in keystore doc
am:
3f0526ea09
Change-Id: I3162cbf57341ab231b84544c04e02d2062dbd304
TreeHugger Robot [Tue, 9 Aug 2016 18:59:32 +0000 (18:59 +0000)]
Merge "Clean up zen rules and permissions immediately on uninstall." into nyc-mr1-dev
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
Andrew Rossignol [Tue, 9 Aug 2016 17:54:38 +0000 (10:54 -0700)]
ContextHub: Avoid reference leaks
The ContextHub HAL was leaking references in passOnOsResponse. An
example of this is when a sensor hub reset occurs. If many of these
resets happen, the local reference pool is exhausted and a crash
in the HAL occurs.
Bug:
30706325
Change-Id: Ica5328137a7033f512d7fb1ccf6fa138eab55091
TreeHugger Robot [Tue, 9 Aug 2016 18:35:07 +0000 (18:35 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs
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
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
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: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: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
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: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
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"
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."
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: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: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
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
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
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