OSDN Git Service
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
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
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
Andrew Rossignol [Tue, 9 Aug 2016 19:17:31 +0000 (19:17 +0000)]
Merge "ContextHub: Avoid reference leaks" into cw-f-dev
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
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
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
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
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:16 +0000 (23:48 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
am:
87c2ed97b8
Change-Id: If031e6c264ecaf23b32b62ac8d0e1036959d242d
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:12 +0000 (23:48 +0000)]
docs: Revised "Optimizing Content for the Assistant" page.
am:
d4197234bb
Change-Id: Iee3f043360bfd8df55265481843e165d1ffc832c
Chris Craik [Mon, 8 Aug 2016 23:44:07 +0000 (23:44 +0000)]
Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev
Kevin Hufnagle [Mon, 8 Aug 2016 23:35:25 +0000 (23:35 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
Makoto Onuki [Mon, 8 Aug 2016 23:27:36 +0000 (23:27 +0000)]
Merge "ShortcutManager improve app udpate check" into nyc-mr1-dev am:
369c6ebf02
am:
4684672789
Change-Id: I02d89a8eb5e626d7e6ec2933e178ea52e0a68109
Makoto Onuki [Mon, 8 Aug 2016 23:27:33 +0000 (23:27 +0000)]
ShortcutManager improve app udpate check am:
64183d5188
am:
bb5db91bf3
Change-Id: I3c8f413dffece083824e5959b5bd167a0a78d2c9
Mark Lu [Mon, 8 Aug 2016 23:21:01 +0000 (23:21 +0000)]
docs: fixed generics in data binding code samples am:
b1b5efd3be am:
7f703bde72 am:
66847abba6
am:
ee0c57417b
Change-Id: I7692ef0a4053cf8220e9b5ec11004b2162f2148c
Jim Miller [Mon, 8 Aug 2016 23:20:58 +0000 (23:20 +0000)]
Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev am:
6cb5152e9f
am:
fb5ae0abff
Change-Id: Icfc434168cb3aae52f234b67f0dff087dee3a41b
Jim Miller [Mon, 8 Aug 2016 23:20:54 +0000 (23:20 +0000)]
Fix bug where foreground activity fails to cancel auth/enrollment am:
37979c9db0
am:
b08d7677d7
Change-Id: Id5ad561221cfcb6999ec9cea560b4654ff8696ab
Makoto Onuki [Mon, 8 Aug 2016 23:20:45 +0000 (23:20 +0000)]
Merge "ShortcutManager improve app udpate check" into nyc-mr1-dev
am:
369c6ebf02
Change-Id: I58aa77cec332d449ec763681e871a79af27e4597
Makoto Onuki [Mon, 8 Aug 2016 23:20:44 +0000 (23:20 +0000)]
ShortcutManager improve app udpate check
am:
64183d5188
Change-Id: I0d5325d861ad52b186f2c7c9c106f485200fb826
Christopher Tate [Mon, 8 Aug 2016 20:09:02 +0000 (13:09 -0700)]
Handle empty/unspecified crop properly in wallpaper restore
Pass 'null' as the crop hint when the crop as expressed in the restored
wallpaper metadata is either unspecified or effectively empty.
Bug
30521402
Bug
30274136
Change-Id: I14e5d2bae1ec30fb27e8fd45b340b2ca87f35a01
Mark Lu [Mon, 8 Aug 2016 23:12:13 +0000 (23:12 +0000)]
docs: fixed generics in data binding code samples am:
b1b5efd3be am:
7f703bde72
am:
66847abba6
Change-Id: If061ef027bb10d651e1b90294b1cdd116fe7b05b
Jim Miller [Mon, 8 Aug 2016 23:12:08 +0000 (23:12 +0000)]
Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev
am:
6cb5152e9f
Change-Id: Iae245cedd050379b6aad1f807e3d9b71dca221c3
Jim Miller [Mon, 8 Aug 2016 23:12:03 +0000 (23:12 +0000)]
Fix bug where foreground activity fails to cancel auth/enrollment
am:
37979c9db0
Change-Id: I486f40d728e2b4bd359c617f31a9032efc6e022b
Mark Lu [Mon, 8 Aug 2016 23:07:46 +0000 (23:07 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am:
a6ee9c1848 am:
325399bfb9
am:
6fadcab88a
Change-Id: Ie0448301e7dc6b0abf3ffe54faea827fe350a944
Mark Lu [Mon, 8 Aug 2016 23:07:43 +0000 (23:07 +0000)]
docs: add info to SharedPreferences.Editor.putString am:
fb48521f41 am:
9bc63b9bf0
am:
3e3e19d3c8
Change-Id: I19a77e2c8e9998ab02b58a1444c5a12b8ea33b43
Winson Chung [Mon, 8 Aug 2016 23:07:38 +0000 (23:07 +0000)]
Merge "Reverting ag/
1288123" into nyc-mr1-dev am:
d983386c31
am:
9bc4d36796
Change-Id: I89db474b4dc0953291a403a6f35f667f5bbab23b
Winson [Mon, 8 Aug 2016 23:07:35 +0000 (23:07 +0000)]
Reverting ag/
1288123 am:
08deff0a67
am:
5ce0a4fb0f
Change-Id: I5ee92797463b32c5f32d109b0ad354498893fd46
Mark Lu [Mon, 8 Aug 2016 23:01:49 +0000 (23:01 +0000)]
docs: fixed generics in data binding code samples am:
b1b5efd3be am:
7f703bde72
am:
cd94572f82
Change-Id: I8bbc9ca66de15b5d2f6be7cde962721d7db78f68
TreeHugger Robot [Mon, 8 Aug 2016 23:01:42 +0000 (23:01 +0000)]
Merge "ShortcutManager improve app udpate check" into nyc-mr1-dev
Mark Lu [Mon, 8 Aug 2016 23:00:15 +0000 (23:00 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am:
a6ee9c1848
am:
325399bfb9
Change-Id: I5105164ff30ea9a285e4e22325ef5c2baa433eeb
Mark Lu [Mon, 8 Aug 2016 23:00:12 +0000 (23:00 +0000)]
docs: add info to SharedPreferences.Editor.putString am:
fb48521f41
am:
9bc63b9bf0
Change-Id: I59a010b5d4d2859ed64cf1ef0684b92ebb9d60d6
Winson Chung [Mon, 8 Aug 2016 23:00:10 +0000 (23:00 +0000)]
Merge "Reverting ag/
1288123" into nyc-mr1-dev
am:
d983386c31
Change-Id: Idd7551d5e95ad542edcc2c6c310163ca6c20d74c
Mark Lu [Mon, 8 Aug 2016 23:00:09 +0000 (23:00 +0000)]
docs: fixed generics in data binding code samples am:
b1b5efd3be
am:
7f703bde72
Change-Id: Ibc12639849de4edcbcfdaa1c0f543d6f2eb868f8
Winson [Mon, 8 Aug 2016 23:00:07 +0000 (23:00 +0000)]
Reverting ag/
1288123
am:
08deff0a67
Change-Id: I13bdc80c790dc1563f6839a98d6dbfce283a2baa
TreeHugger Robot [Mon, 8 Aug 2016 22:55:04 +0000 (22:55 +0000)]
Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev
OSDN Git Service
