git.osdn.net Git - android-x86/frameworks-base.git/log

Andrew Solovay [Sat, 16 Jul 2016 00:49:45 +0000 (00:49 +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
am: 4eb66d1d4b

Change-Id: I43f9400975fef2ecf15806c0de40b6af4d9f75cb

commit | commitdiff | tree

Andrew Solovay [Sat, 16 Jul 2016 00:49:41 +0000 (00:49 +0000)]

Merge \\\"docs: Updating N Preview \\\"behavior changes\\\" doc for DP5\\\" into nyc-dev am: 9d3bc86207 am: 8af870a778
am: 7097984ba5

Change-Id: I02fc4ceec95c994dcbc915ac3a28f21740e376e0

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Andrew Solovay [Sat, 16 Jul 2016 00:35:50 +0000 (00:35 +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
am: f00bbba326

Change-Id: I4c9feb5461ad10e5afa5d5be24547535616535b5

commit | commitdiff | tree

Andrew Solovay [Sat, 16 Jul 2016 00:35:47 +0000 (00:35 +0000)]

Merge \\\"docs: Updating N Preview \\\"API Overview\\\" doc for DP5\\\" into nyc-dev am: 833722e049 am: 843979a3b3
am: 3cbde13f9e

Change-Id: I2716e851fdf2af3dc880f9466570575e235bd961

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Amith Yamasani [Sat, 16 Jul 2016 00:22:04 +0000 (00:22 +0000)]

Merge \\"Block camera gesture during secondary user SUW\\" into nyc-mr1-dev am: e1a3a449a4
am: d0cecf9d67

Change-Id: I675832bc2c88477c8cf5e70f30a5b8e9b25048ff

commit | commitdiff | tree

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

commit | commitdiff | tree

Steve McKay [Sat, 16 Jul 2016 00:12:53 +0000 (00:12 +0000)]

Merge \\"Include an app icon.\\" into nyc-mr1-dev am: 3d8c9981b5
am: a8387db55e

Change-Id: Ibe38576f5bada20131d05e550d93f6b6be54179f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Doris Liu [Sat, 16 Jul 2016 00:04:42 +0000 (00:04 +0000)]

Merge \\"Ensure native allocation/free is correctly registered\\" into nyc-mr1-dev am: a7272b4cad
am: f5b87ce908

Change-Id: Ic04a562f2c32cb0187713f2b661e35fb3f7f6023

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 15 Jul 2016 23:59:44 +0000 (23:59 +0000)]

Merge "Include an app icon." into nyc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Makoto Onuki [Fri, 15 Jul 2016 23:56:03 +0000 (23:56 +0000)]

Merge \\"Don\\'t accept resource references in string fields\\" into nyc-mr1-dev am: 6fa0e4d518
am: 3d3e2e2b17

Change-Id: Ib5a83728239cfa074fb9800b76bc217dcf990b30

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 15 Jul 2016 23:37:29 +0000 (23:37 +0000)]

Merge \"Merge \\"Build both filename views before deleting.\\" into nyc-mr1-dev am: fff6a11438\" into nyc-mr1-dev-plus-aosp
am: 40a4bf7dc1

Change-Id: Iabb5ffbc0ef161bb67d373fd13385e05d88b4179

commit | commitdiff | tree

Andrew Solovay [Fri, 15 Jul 2016 23:37:21 +0000 (23:37 +0000)]

Merge \\\"docs: Updating N Preview release notes for DP5\\\" into nyc-dev am: b91693fedd am: 5de36f1ba0
am: 64c147b2cd

Change-Id: I30d4d36fd1047c1557319e7030a502d0807ddc27

commit | commitdiff | tree

Andrew Solovay [Fri, 15 Jul 2016 23:35:12 +0000 (23:35 +0000)]

Merge \\\"docs: Updating N Preview release notes for DP5\\\" into nyc-dev am: b91693fedd am: e4846ae107
am: 91eaa3ec0e

Change-Id: I73f1494f0c2c72d707a445f082e631f200aab5f2

commit | commitdiff | tree

Andrew Solovay [Fri, 15 Jul 2016 23:35:05 +0000 (23:35 +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
am: 8ff25378a0

Change-Id: Ifc8875e97c300ed96df2eab5c61459395ebcec91

commit | commitdiff | tree

Andrew Solovay [Fri, 15 Jul 2016 23:34:59 +0000 (23:34 +0000)]

Merge \\\"docs: Describe how to update N Preview test devices on N release\\\" into nyc-dev am: 085b4e8f7b am: 9ef754c105
am: 3b6d0481c0

Change-Id: I99a0a848f4808e01a3aaa552f1de62ea5e2d43f7

commit | commitdiff | tree

Makoto Onuki [Fri, 15 Jul 2016 23:34:53 +0000 (23:34 +0000)]

Merge \\"Cache the default launcher.\\" into nyc-mr1-dev am: cf99263662
am: 6406be311c

Change-Id: If7d3f5325388242a196d78f8429c4aba65ef041e

commit | commitdiff | tree

Andreas Gampe [Fri, 15 Jul 2016 23:34:46 +0000 (23:34 +0000)]

Merge \\"Frameworks/base: Add compiler stats to Package Manager\\" into nyc-mr1-dev am: f52ce76d1f
am: a2bff32318

Change-Id: I0a1de16d538e11756df7bda4390c445d5591608e

commit | commitdiff | tree

Ashutosh Joshi [Fri, 15 Jul 2016 23:28:28 +0000 (23:28 +0000)]

Merge \\"Loading NanoApps now works.\\" into nyc-mr1-dev am: 095979b463
am: 820ab55e1c

Change-Id: Ib92f140990ed577483bcafdbdc87118f2528144e

commit | commitdiff | tree

Cheryl Potter [Fri, 15 Jul 2016 23:28:26 +0000 (23:28 +0000)]

Merge \\\"docs: Add redirect for new AS Help menu item b/30165151\\\" into nyc-dev am: 462e5aae83 am: 8b9015899d
am: c2d6b29bdd

Change-Id: Id133ae097f043a2207a0811ee49e7f0f8611560c

commit | commitdiff | tree

Cheryl Potter [Fri, 15 Jul 2016 23:28:23 +0000 (23:28 +0000)]

Merge \\\"docs: Add redirect for new AS Help menu item b/30165151\\\" into nyc-dev am: 462e5aae83 am: c9515ae39d
am: cb8fbd4bea

Change-Id: I925aa8509cb197da6e2a9175abacadb027d9682b

commit | commitdiff | tree

Makoto Onuki [Fri, 15 Jul 2016 23:28:20 +0000 (23:28 +0000)]

Merge \\"Fix the allowed icon type error message\\" into nyc-mr1-dev am: fd57d549cf
am: 3e3f0f1ba8

Change-Id: Iaa3eb26436dfa339ee7e095562344394dcd56b53

commit | commitdiff | tree

Mike Tsao [Fri, 15 Jul 2016 23:28:17 +0000 (23:28 +0000)]

Merge \\"Back up Night Light settings\\" into nyc-mr1-dev am: 9a0e444c22
am: d4584a8fb5

Change-Id: I15db4e270c6306fc666c9f33914f242e9e21a1fd

commit | commitdiff | tree

Andrew Solovay [Fri, 15 Jul 2016 23:25:37 +0000 (23:25 +0000)]

Merge \"Merge \\\"docs: Updating image download pages for DP5\\\" into nyc-dev am: 84d59bc35d am: 37018626c9\" into nyc-mr1-dev-plus-aosp
am: eb9b6ed05e

Change-Id: I926d20a6d494beb7aa449ddbd42b1bf09f33fbb8

commit | commitdiff | tree

Andrew Solovay [Fri, 15 Jul 2016 23:25:35 +0000 (23:25 +0000)]

Merge \\\"docs: Updating image download pages for DP5\\\" into nyc-dev am: 84d59bc35d am: 7005fff3f1
am: 0255dbb58d

Change-Id: I8a070eb4be0f405f25f6b5610c133a2f39666ef6

commit | commitdiff | tree

Adrian Roos [Fri, 15 Jul 2016 23:25:31 +0000 (23:25 +0000)]

Merge \\"Doze: Add config for fine grained proximity checks\\" into nyc-mr1-dev am: 4ba23f30b5
am: e0cac111db

Change-Id: Iff1af5e273af306190539a91fed0876f19b38888

commit | commitdiff | tree

Adrian Roos [Fri, 15 Jul 2016 23:25:27 +0000 (23:25 +0000)]

Merge \\"Notification: Apply small icon level\\" into nyc-mr1-dev am: 9d8de73530
am: 8b942b2404

Change-Id: I8471581ac27fb1c35126635bdc655b8c8ddea328

commit | commitdiff | tree

Adrian Roos [Fri, 15 Jul 2016 23:25:19 +0000 (23:25 +0000)]

Merge \\"Add way to set live wallpaper across users\\" into nyc-mr1-dev am: 9a7c3bd577
am: 119840eb91

Change-Id: I16436af5b7ada58113d846b9836d302061730177

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Dan Yu [Fri, 15 Jul 2016 23:14:04 +0000 (23:14 +0000)]

Merge \"Merge \\\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\\" into nyc-dev am: 344a7375d7 am: d5b43852dc\" into nyc-mr1-dev-plus-aosp
am: dbf1504128

Change-Id: Iacb23044e44049877b76e7a07426161f5a0a95f9

commit | commitdiff | tree

Daniel Yu [Fri, 15 Jul 2016 23:14:01 +0000 (23:14 +0000)]

Merge \\\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\\" into nyc-dev am: 344a7375d7 am: 7b10126ed6
am: 79b1bb4878

Change-Id: I014bece8c337e4997866668af8964cc76cd5d6cd

commit | commitdiff | tree

Svetoslav Ganov [Fri, 15 Jul 2016 23:13:59 +0000 (23:13 +0000)]

Merge \\"Prevent apps to overlay other apps via toast windows\\" into nyc-mr1-dev am: e2d148b008
am: cd263d56d2

Change-Id: I4971baf5ef2a522f8acea091023936e033f23cea

commit | commitdiff | tree

Jason Monk [Fri, 15 Jul 2016 23:13:56 +0000 (23:13 +0000)]

Merge \\"Reduce contention of ApplicationsState locks\\" into nyc-mr1-dev am: 9e133205e3
am: b3bbcf256f

Change-Id: I15b3cd0e2690ad1c9f5bc04afc3224dd771d7ae0

commit | commitdiff | tree

Vineeta Srivastava [Fri, 15 Jul 2016 23:13:43 +0000 (23:13 +0000)]

Merge \\"Add carrier config to report IMEI on CDMA phone.\\" into nyc-mr1-dev am: a5b923bdd7
am: 199290cdab

Change-Id: Ia4f53257e352b3f71810582867258ec318cf47d6

commit | commitdiff | tree

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

commit | commitdiff | tree

Fan Zhang [Fri, 15 Jul 2016 23:06:24 +0000 (23:06 +0000)]

Merge "resolve merge conflicts of b9d34b3 to master"

commit | commitdiff | tree

TreeHugger Robot [Fri, 15 Jul 2016 23:05:14 +0000 (23:05 +0000)]

Merge "Build both filename views before deleting." into nyc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Ben Lin [Fri, 15 Jul 2016 22:56:43 +0000 (22:56 +0000)]

Merge "Fix a crash happening on a context menu."

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Steve McKay [Fri, 15 Jul 2016 21:46:56 +0000 (14:46 -0700)]

Include an app icon.

Bug: 29880363
Change-Id: Ia8d9414ce536fb35acec1357d0f69d3ee158d853

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Makoto Onuki [Fri, 15 Jul 2016 22:22:33 +0000 (22:22 +0000)]

Merge "Cache the default launcher." into nyc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Ashutosh Joshi [Fri, 15 Jul 2016 22:12:41 +0000 (22:12 +0000)]

Merge "Loading NanoApps now works." into nyc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 15 Jul 2016 21:28:33 +0000 (21:28 +0000)]

Merge "Back up Night Light settings" into nyc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Fan Zhang [Fri, 15 Jul 2016 21:21:47 +0000 (14:21 -0700)]

resolve merge conflicts of b9d34b3 to master

Change-Id: Id88ecf373378f9ed7c18a3d2d84ab419dd033891

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Adrian Roos [Fri, 15 Jul 2016 21:09:36 +0000 (21:09 +0000)]

Merge "Notification: Apply small icon level" into nyc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 15 Jul 2016 21:08:45 +0000 (21:08 +0000)]

Merge "docs: Updating image download pages for DP5" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 15 Jul 2016 21:07:30 +0000 (21:07 +0000)]