OSDN Git Service
Scott Main [Mon, 18 Jul 2016 15:15:14 +0000 (15:15 +0000)]
Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am:
6623f4177c
am:
38b71c5741
Change-Id: Ice045bb360e2de70af6cc3cc721d6ec5f55e8f58
Android Build Merger (Role) [Mon, 18 Jul 2016 15:09:44 +0000 (15:09 +0000)]
Merge "Merge \"Merge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev am:
e92ebf666e\" into nyc-mr1-dev am:
838542a660" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 18 Jul 2016 15:09:29 +0000 (15:09 +0000)]
Merge "Merge \"Add an isListen method to NetworkRequests.\" into nyc-mr1-dev am:
b5239329b1" into nyc-mr1-dev-plus-aosp
Dirk Dougherty [Mon, 18 Jul 2016 15:09:05 +0000 (15:09 +0000)]
Merge \"Merge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev am:
e92ebf666e\" into nyc-mr1-dev
am:
838542a660
Change-Id: Ic79c889b404ea1c576b8f50431e2774dc8b2de12
Lorenzo Colitti [Mon, 18 Jul 2016 15:08:54 +0000 (15:08 +0000)]
Merge \"Add an isListen method to NetworkRequests.\" into nyc-mr1-dev
am:
b5239329b1
Change-Id: Ib712c3c7b44d3a623d5f5facf0c7f6844c3ebb82
Dirk Dougherty [Mon, 18 Jul 2016 15:08:30 +0000 (15:08 +0000)]
Merge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev am:
e92ebf666e
am:
edf16d6d4b
Change-Id: I46312fed717840506111bde4be9d6ae1dc239caa
smain@google.com [Mon, 18 Jul 2016 15:08:13 +0000 (15:08 +0000)]
Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev
am:
6623f4177c
Change-Id: Iedcaed7bc842c353bbf2dc3f66dfa5054613d1e8
Android Build Merger (Role) [Mon, 18 Jul 2016 15:03:02 +0000 (15:03 +0000)]
Merge "Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev am:
e92ebf666e" into nyc-mr1-dev
Dirk Dougherty [Mon, 18 Jul 2016 15:02:29 +0000 (15:02 +0000)]
Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev
am:
e92ebf666e
Change-Id: I7df3eb17a67a1ddc2019644d1efadacb149dcf48
Dirk Dougherty [Mon, 18 Jul 2016 15:02:28 +0000 (15:02 +0000)]
Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev
am:
e92ebf666e
Change-Id: I1396a1e544c31308bbe33ca525bace7640edbd3f
Alan Viverette [Mon, 18 Jul 2016 15:02:13 +0000 (15:02 +0000)]
Merge \"Use \"real\" display size for computing available densities\" into nyc-mr1-dev
am:
ad126d3b8b
Change-Id: Ib4641e6577dbae1bbe5a4215dd2b1d947399a1c9
TreeHugger Robot [Mon, 18 Jul 2016 15:00:20 +0000 (15:00 +0000)]
Merge "Add an isListen method to NetworkRequests." into nyc-mr1-dev
Scott Main [Mon, 18 Jul 2016 14:57:37 +0000 (14:57 +0000)]
Merge "update the version number used in docs and update the offline docs landing page" into nyc-dev
TreeHugger Robot [Mon, 18 Jul 2016 14:53:55 +0000 (14:53 +0000)]
Merge "Use "real" display size for computing available densities" into nyc-mr1-dev
Dirk Dougherty [Mon, 18 Jul 2016 14:52:44 +0000 (14:52 +0000)]
Merge "Doc change: updates for DP5 release notes." into nyc-dev
Ricky Wai [Mon, 18 Jul 2016 14:29:51 +0000 (14:29 +0000)]
Merge \"Do not allow to disable package \"android\"\" into nyc-mr1-dev
am:
a5111bfda4
Change-Id: Ia983198d1c41848d78ef18ed189d6f68cbc39350
Ricky Wai [Mon, 18 Jul 2016 14:22:26 +0000 (14:22 +0000)]
Merge "Do not allow to disable package "android"" into nyc-mr1-dev
Android Build Merger (Role) [Mon, 18 Jul 2016 13:33:35 +0000 (13:33 +0000)]
Merge "Merge \\"Check uid for notification policy access.\\" into nyc-dev am:
8f17d2a48b am:
5710e91931" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Mon, 18 Jul 2016 13:33:04 +0000 (13:33 +0000)]
Merge \\"Check uid for notification policy access.\\" into nyc-dev am:
8f17d2a48b
am:
5710e91931
Change-Id: I1a4957ded3e3526df8b2bb36093b70cee3f8c065
Julia Reynolds [Mon, 18 Jul 2016 13:32:57 +0000 (13:32 +0000)]
Merge \\"Check uid for notification policy access.\\" into nyc-dev am:
8f17d2a48b
am:
5921f81724
Change-Id: I48923935bf394c39441335423a24dd0b88b8b51e
Ricky Wai [Fri, 15 Jul 2016 14:44:07 +0000 (15:44 +0100)]
Do not allow to disable package "android"
Bug:
25337001
Change-Id: I837d70898f00d3c97c8ae1f5eadd0791ba045df6
Julia Reynolds [Mon, 18 Jul 2016 13:25:54 +0000 (13:25 +0000)]
Merge \"Check uid for notification policy access.\" into nyc-dev
am:
8f17d2a48b
Change-Id: Iade2316b64a8d6dc43636fb292c08dbf82c9dc59
Julia Reynolds [Mon, 18 Jul 2016 13:25:51 +0000 (13:25 +0000)]
Merge \"Check uid for notification policy access.\" into nyc-dev
am:
8f17d2a48b
Change-Id: Ibe8b12cb0bb57a31e0e1ca077863b2cf63daba1a
Julia Reynolds [Mon, 18 Jul 2016 13:16:15 +0000 (13:16 +0000)]
Merge "Check uid for notification policy access." into nyc-dev
Lorenzo Colitti [Mon, 18 Jul 2016 09:17:08 +0000 (18:17 +0900)]
Add an isListen method to NetworkRequests.
This allows simplification of the ConnectivityService code.
Bug:
23113288
Change-Id: I124544b99c5a920124e9a3d31cda8c6d2abc21fd
Dirk Dougherty [Mon, 18 Jul 2016 03:59:36 +0000 (20:59 -0700)]
Doc change: updates for DP5 release notes.
Change-Id: I39cca9088d6fc5952a359f42e43a324aad4427f0
Abodunrinwa Toki [Sun, 17 Jul 2016 18:20:11 +0000 (18:20 +0000)]
Merge \"FloatingActionMode: Fix screen coordinates.\" into nyc-mr1-dev
am:
3b8e0fdf92
Change-Id: If193932cfe4b79535ba8d2ce44f144899e81ee4e
Abodunrinwa Toki [Sun, 17 Jul 2016 18:07:08 +0000 (18:07 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-mr1-dev
Tim Murray [Sat, 16 Jul 2016 19:25:37 +0000 (19:25 +0000)]
Merge \"Make sure StrictMode allows disk reads when calling isThreadInProcess.\" into nyc-mr1-dev
am:
afa67f3d34
Change-Id: I2b3afb4acb9038a2d33ecf42bbbcc8c5d754ab5f
Tim Murray [Sat, 16 Jul 2016 19:14:29 +0000 (19:14 +0000)]
Merge "Make sure StrictMode allows disk reads when calling isThreadInProcess." into nyc-mr1-dev
Tim Murray [Sat, 16 Jul 2016 18:28:40 +0000 (11:28 -0700)]
Make sure StrictMode allows disk reads when calling isThreadInProcess.
If an application thread disables disk reads on the main thread,
isThreadInProcess will trigger a strict mode violation. This is bad if
the RenderThread is created after disk reads have been disallowed.
bug
30170339
Change-Id: I6918605d11f0c586c156f3168051376c3209b3f1
Adam Lesinski [Sat, 16 Jul 2016 02:38:24 +0000 (02:38 +0000)]
Merge \"Deprecate Resources constructor and updateConfiguration() method\" into nyc-mr1-dev
am:
c3829f528e
Change-Id: I59c4daf39179409cc3195cda9c89ae604ec36af6
Andreas Gampe [Sat, 16 Jul 2016 02:38:18 +0000 (02:38 +0000)]
Frameworks/base: Fix braino missing line
am:
06eb24d95e
Change-Id: I34b1b3084da32be43fda62d23c0b955e3cc6f335
TreeHugger Robot [Sat, 16 Jul 2016 02:33:54 +0000 (02:33 +0000)]
Merge "Deprecate Resources constructor and updateConfiguration() method" into nyc-mr1-dev
Andreas Gampe [Sat, 16 Jul 2016 01:12:02 +0000 (18:12 -0700)]
Frameworks/base: Fix braino missing line
This got accidentally deleted in cleanup.
Bug:
29223204
Change-Id: I018b44d517f226eca30f141a3397c82a4be19afb
Adam Lesinski [Sat, 16 Jul 2016 00:49:49 +0000 (17:49 -0700)]
Deprecate Resources constructor and updateConfiguration() method
These methods were never meant to be public. Instead, developers
can use Context#createConfigurationContext().
Bug:
30088019
Bug:
29999297
Change-Id: I2b864136163deda0af99fa3bfe9ef4ee1077341a
Android Build Merger (Role) [Sat, 16 Jul 2016 00:41:56 +0000 (00:41 +0000)]
Merge "Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am:
9d3bc86207 am:
72022a691a" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Sat, 16 Jul 2016 00:41:33 +0000 (00:41 +0000)]
Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am:
9d3bc86207
am:
72022a691a
Change-Id: I4c85652bbc4d67507c419b5362341e993f932866
Andrew Solovay [Sat, 16 Jul 2016 00:41:16 +0000 (00:41 +0000)]
Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am:
9d3bc86207
am:
8af870a778
Change-Id: I257e7b0774f7892373963883a362b44ba5ec4759
Andrew Solovay [Sat, 16 Jul 2016 00:35:41 +0000 (00:35 +0000)]
Merge \"docs: Updating N Preview \"behavior changes\" doc for DP5\" into nyc-dev
am:
9d3bc86207
Change-Id: Iede90cc135476ea34b82f49c464a14eba9d60a31
Andrew Solovay [Sat, 16 Jul 2016 00:35:31 +0000 (00:35 +0000)]
Merge \"docs: Updating N Preview \"behavior changes\" doc for DP5\" into nyc-dev
am:
9d3bc86207
Change-Id: I21af2f098ffd3034b3f88548bfa9210996f7b397
Android Build Merger (Role) [Sat, 16 Jul 2016 00:30:13 +0000 (00:30 +0000)]
Merge "Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am:
833722e049 am:
f5f50cfc7a" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Sat, 16 Jul 2016 00:29:49 +0000 (00:29 +0000)]
Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am:
833722e049
am:
f5f50cfc7a
Change-Id: Icc3d60d6ad55805be520975033e2a0f157721c50
Andrew Solovay [Sat, 16 Jul 2016 00:28:26 +0000 (00:28 +0000)]
Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am:
833722e049
am:
843979a3b3
Change-Id: I9a86bd40709f5a9006f669cbdbd94d10bfd8d555
TreeHugger Robot [Sat, 16 Jul 2016 00:24:48 +0000 (00:24 +0000)]
Merge "docs: Updating N Preview "behavior changes" doc for DP5" into nyc-dev
Andrew Solovay [Sat, 16 Jul 2016 00:23:00 +0000 (00:23 +0000)]
Merge \"docs: Updating N Preview \"API Overview\" doc for DP5\" into nyc-dev
am:
833722e049
Change-Id: Id869d494381ff6e53066eab1dcbb4a3ee447384d
Andrew Solovay [Sat, 16 Jul 2016 00:22:59 +0000 (00:22 +0000)]
Merge \"docs: Updating N Preview \"API Overview\" doc for DP5\" into nyc-dev
am:
833722e049
Change-Id: I8b594c2f28db69dd6e645dc2d79405f6da764806
TreeHugger Robot [Sat, 16 Jul 2016 00:13:16 +0000 (00:13 +0000)]
Merge "docs: Updating N Preview "API Overview" doc for DP5" into nyc-dev
Amith Yamasani [Sat, 16 Jul 2016 00:12:03 +0000 (00:12 +0000)]
Merge \"Block camera gesture during secondary user SUW\" into nyc-mr1-dev
am:
e1a3a449a4
Change-Id: I92755956d3047902086945ce7479fc16bfa70b84
Steve McKay [Sat, 16 Jul 2016 00:06:10 +0000 (00:06 +0000)]
Merge \"Include an app icon.\" into nyc-mr1-dev
am:
3d8c9981b5
Change-Id: I14f2d90fc7c0f21ab0fe6b993c1ef6d8ed665831
TreeHugger Robot [Sat, 16 Jul 2016 00:03:51 +0000 (00:03 +0000)]
Merge "Block camera gesture during secondary user SUW" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 23:59:44 +0000 (23:59 +0000)]
Merge "Include an app icon." into nyc-mr1-dev
Doris Liu [Fri, 15 Jul 2016 23:56:24 +0000 (23:56 +0000)]
Merge \"Ensure native allocation/free is correctly registered\" into nyc-mr1-dev
am:
a7272b4cad
Change-Id: Ib1d07a6420d6800b290d0c47e9fcfe3690c541eb
Makoto Onuki [Fri, 15 Jul 2016 23:50:51 +0000 (23:50 +0000)]
Merge \"Don\'t accept resource references in string fields\" into nyc-mr1-dev
am:
6fa0e4d518
Change-Id: I8bc05f17694aca0c24e280daa2fcd8464aa1fd05
Doris Liu [Fri, 15 Jul 2016 23:46:07 +0000 (23:46 +0000)]
Merge "Ensure native allocation/free is correctly registered" into nyc-mr1-dev
Makoto Onuki [Fri, 15 Jul 2016 23:41:10 +0000 (23:41 +0000)]
Merge "Don't accept resource references in string fields" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 15 Jul 2016 23:16:56 +0000 (23:16 +0000)]
Merge "Merge \"Build both filename views before deleting.\" into nyc-mr1-dev am:
fff6a11438" into nyc-mr1-dev-plus-aosp
Jeff Sharkey [Fri, 15 Jul 2016 23:16:35 +0000 (23:16 +0000)]
Merge \"Build both filename views before deleting.\" into nyc-mr1-dev
am:
fff6a11438
Change-Id: Ie97bade1f8396c3c08f622f2533d42d115568e08
Andrew Solovay [Fri, 15 Jul 2016 23:15:57 +0000 (23:15 +0000)]
Merge \\"docs: Updating N Preview release notes for DP5\\" into nyc-dev am:
b91693fedd
am:
5de36f1ba0
Change-Id: Ib60985ae93a52c826a75c96df6b8d2d50d448ad4
Andrew Solovay [Fri, 15 Jul 2016 23:10:58 +0000 (23:10 +0000)]
Merge \\"docs: Updating N Preview release notes for DP5\\" into nyc-dev am:
b91693fedd
am:
e4846ae107
Change-Id: I81bb81225087441a2906b36a67ad68b247b36fb0
TreeHugger Robot [Fri, 15 Jul 2016 23:05:14 +0000 (23:05 +0000)]
Merge "Build both filename views before deleting." into nyc-mr1-dev
Andrew Solovay [Fri, 15 Jul 2016 02:08:11 +0000 (19:08 -0700)]
docs: Updating N Preview "behavior changes" doc for DP5
See first comment for doc stage location.
Change-Id: I11720bdabca78fdbaca82c7e3467f47b51e60f15
Andrew Solovay [Fri, 15 Jul 2016 22:55:38 +0000 (22:55 +0000)]
Merge \"docs: Updating N Preview release notes for DP5\" into nyc-dev
am:
b91693fedd
Change-Id: I2e697679697d56695bd6e26eeb4ff2dba58632d1
Andrew Solovay [Fri, 15 Jul 2016 22:55:37 +0000 (22:55 +0000)]
Merge \"docs: Updating N Preview release notes for DP5\" into nyc-dev
am:
b91693fedd
Change-Id: I9e9a0982a141d09da5e7d68fb01df48adcb619a3
Android Build Merger (Role) [Fri, 15 Jul 2016 22:52:01 +0000 (22:52 +0000)]
Merge "Merge \\"docs: Describe how to update N Preview test devices on N release\\" into nyc-dev am:
085b4e8f7b am:
64e25cf4d3" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Fri, 15 Jul 2016 22:51:27 +0000 (22:51 +0000)]
Merge \\"docs: Describe how to update N Preview test devices on N release\\" into nyc-dev am:
085b4e8f7b
am:
64e25cf4d3
Change-Id: Ia118a84d08bfd049036e8a8dba107213f4732ca7
Andrew Solovay [Fri, 15 Jul 2016 22:51:20 +0000 (22:51 +0000)]
Merge \\"docs: Describe how to update N Preview test devices on N release\\" into nyc-dev am:
085b4e8f7b
am:
9ef754c105
Change-Id: Ia924b34cae241e95ba4354ebb795fd2003ba392a
Andrew Solovay [Fri, 15 Jul 2016 22:46:49 +0000 (22:46 +0000)]
Merge "docs: Updating N Preview release notes for DP5" into nyc-dev
Andrew Solovay [Fri, 15 Jul 2016 22:46:14 +0000 (22:46 +0000)]
Merge \"docs: Describe how to update N Preview test devices on N release\" into nyc-dev
am:
085b4e8f7b
Change-Id: I9a005cea1e0e3b61d20003ebb975d4b04ebdba5c
Andrew Solovay [Fri, 15 Jul 2016 22:45:57 +0000 (22:45 +0000)]
Merge \"docs: Describe how to update N Preview test devices on N release\" into nyc-dev
am:
085b4e8f7b
Change-Id: Id0ad00358c59e0a4187bd1f67bfc329e328c17bd
TreeHugger Robot [Fri, 15 Jul 2016 22:42:27 +0000 (22:42 +0000)]
Merge "docs: Describe how to update N Preview test devices on N release" into nyc-dev
Andrew Solovay [Fri, 15 Jul 2016 20:04:04 +0000 (13:04 -0700)]
docs: Updating N Preview "API Overview" doc for DP5
Added new "WebView" section, and minor tweak to the "Always On VPN"
section.
See first comment for doc stage location.
Change-Id: I1f57c2a73d1c8adaf4de0bf928711ba75f732436
Steve McKay [Fri, 15 Jul 2016 21:46:56 +0000 (14:46 -0700)]
Include an app icon.
Bug:
29880363
Change-Id: Ia8d9414ce536fb35acec1357d0f69d3ee158d853
Amith Yamasani [Fri, 15 Jul 2016 22:33:03 +0000 (15:33 -0700)]
Block camera gesture during secondary user SUW
Check for the current user's setup_complete state
before acting on the double-tap on power camera
launcher.
Bug:
30155500
Change-Id: I2ee8601411d270e288410e9d22ae07b97fa0de70
Makoto Onuki [Fri, 15 Jul 2016 22:26:15 +0000 (22:26 +0000)]
Merge \"Cache the default launcher.\" into nyc-mr1-dev
am:
cf99263662
Change-Id: If8d15587702dad81d9a9025e13dec9820456287b
Andreas Gampe [Fri, 15 Jul 2016 22:26:09 +0000 (22:26 +0000)]
Merge \"Frameworks/base: Add compiler stats to Package Manager\" into nyc-mr1-dev
am:
f52ce76d1f
Change-Id: Ifeb2471b276ef29e58c511f89bd27b1d9bb8591f
Makoto Onuki [Fri, 15 Jul 2016 22:22:33 +0000 (22:22 +0000)]
Merge "Cache the default launcher." into nyc-mr1-dev
Ashutosh Joshi [Fri, 15 Jul 2016 22:21:01 +0000 (22:21 +0000)]
Merge \"Loading NanoApps now works.\" into nyc-mr1-dev
am:
095979b463
Change-Id: I8035e04cc0ca040357a8799136c9b31702a151c0
TreeHugger Robot [Fri, 15 Jul 2016 22:20:37 +0000 (22:20 +0000)]
Merge "Frameworks/base: Add compiler stats to Package Manager" into nyc-mr1-dev
Cheryl Potter [Fri, 15 Jul 2016 22:14:16 +0000 (22:14 +0000)]
Merge \\"docs: Add redirect for new AS Help menu item b/
30165151\\" into nyc-dev am:
462e5aae83
am:
8b9015899d
Change-Id: I374b51217e9e485c875599c33c5298c69ffd9028
Ashutosh Joshi [Fri, 15 Jul 2016 22:12:41 +0000 (22:12 +0000)]
Merge "Loading NanoApps now works." into nyc-mr1-dev
Cheryl Potter [Fri, 15 Jul 2016 22:08:21 +0000 (22:08 +0000)]
Merge \\"docs: Add redirect for new AS Help menu item b/
30165151\\" into nyc-dev am:
462e5aae83
am:
c9515ae39d
Change-Id: If4bf155a4f2afc268497ef6ddba646c3c5b6f335
Cheryl Potter [Fri, 15 Jul 2016 22:07:16 +0000 (22:07 +0000)]
Merge \"docs: Add redirect for new AS Help menu item b/
30165151\" into nyc-dev
am:
462e5aae83
Change-Id: Iaf769efa2d7e30d82d02f1e8fd1ee96da640bf57
Cheryl Potter [Fri, 15 Jul 2016 22:02:12 +0000 (22:02 +0000)]
Merge \"docs: Add redirect for new AS Help menu item b/
30165151\" into nyc-dev
am:
462e5aae83
Change-Id: I13223f73b59cce6f9ed4256af0cfeba12e2d1771
Cheryl Potter [Fri, 15 Jul 2016 21:55:04 +0000 (21:55 +0000)]
Merge "docs: Add redirect for new AS Help menu item b/
30165151" into nyc-dev
Makoto Onuki [Fri, 15 Jul 2016 21:50:46 +0000 (21:50 +0000)]
Merge \"Fix the allowed icon type error message\" into nyc-mr1-dev
am:
fd57d549cf
Change-Id: Ibff8d87533d075f0af95ab98d44f67fd4405a951
TreeHugger Robot [Fri, 15 Jul 2016 21:43:01 +0000 (21:43 +0000)]
Merge "Fix the allowed icon type error message" into nyc-mr1-dev
Jeff Sharkey [Fri, 15 Jul 2016 21:34:41 +0000 (15:34 -0600)]
Build both filename views before deleting.
Otherwise we'll throw when trying to create the second (visible)
filename because we just deleted it.
Bug:
30087518
Change-Id: I940a8f81c264fc17d477fadf46fd48eae29f2f6f
Mike Tsao [Fri, 15 Jul 2016 21:33:57 +0000 (21:33 +0000)]
Merge \"Back up Night Light settings\" into nyc-mr1-dev
am:
9a0e444c22
Change-Id: I4bc968dfced4671fecb140c50ce759b02d78c4a1
Andrew Solovay [Wed, 13 Jul 2016 19:13:08 +0000 (12:13 -0700)]
docs: Describe how to update N Preview test devices on N release
Noted that devices that are signed up for OTA updates will
automatically update to release version; devices that you flash
manually (and don't subsequently sign up for the beta program) will
need to be flashed with the production version.
See first comment for doc stage location.
Change-Id: I6755c837f80a459776880422f6d84af1d0b75f34
TreeHugger Robot [Fri, 15 Jul 2016 21:28:33 +0000 (21:28 +0000)]
Merge "Back up Night Light settings" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 15 Jul 2016 21:23:02 +0000 (21:23 +0000)]
Merge "Merge \\"docs: Updating image download pages for DP5\\" into nyc-dev am:
84d59bc35d am:
37018626c9" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Fri, 15 Jul 2016 21:22:38 +0000 (21:22 +0000)]
Merge \\"docs: Updating image download pages for DP5\\" into nyc-dev am:
84d59bc35d
am:
37018626c9
Change-Id: I6ebeb1bcea4014437244cbec609d20b74f5d0b3d
Andrew Solovay [Fri, 15 Jul 2016 21:22:23 +0000 (21:22 +0000)]
Merge \\"docs: Updating image download pages for DP5\\" into nyc-dev am:
84d59bc35d
am:
7005fff3f1
Change-Id: Ib05fc77234b2c2423a2dcf962d74781200a2ad0b
Adrian Roos [Fri, 15 Jul 2016 21:16:49 +0000 (21:16 +0000)]
Merge \"Doze: Add config for fine grained proximity checks\" into nyc-mr1-dev
am:
4ba23f30b5
Change-Id: Ibd911a479877fe6e944fcd421807c052fa05df70
Adrian Roos [Fri, 15 Jul 2016 21:16:41 +0000 (21:16 +0000)]
Merge \"Notification: Apply small icon level\" into nyc-mr1-dev
am:
9d8de73530
Change-Id: Iac5f0b6e210355867f79cbc7f48165517ba11a26
Adrian Roos [Fri, 15 Jul 2016 21:16:36 +0000 (21:16 +0000)]
Merge \"Add way to set live wallpaper across users\" into nyc-mr1-dev
am:
9a7c3bd577
Change-Id: Ia5630143df774d76d5867e8e9541775e07e1c5df
Andrew Solovay [Fri, 15 Jul 2016 21:16:12 +0000 (21:16 +0000)]
Merge \"docs: Updating image download pages for DP5\" into nyc-dev
am:
84d59bc35d
Change-Id: I55e20f874b01109861f06f92d7f4586e155a0786
Andrew Solovay [Fri, 15 Jul 2016 21:16:06 +0000 (21:16 +0000)]
Merge \"docs: Updating image download pages for DP5\" into nyc-dev
am:
84d59bc35d
Change-Id: I9c9f5afb071adccacc27b2479330ddbd121a631f
Adrian Roos [Fri, 15 Jul 2016 21:09:50 +0000 (21:09 +0000)]
Merge "Doze: Add config for fine grained proximity checks" into nyc-mr1-dev
OSDN Git Service
