Andrew Solovay
342bc638cd
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
2016-07-15 23:35:05 +00:00
Andrew Solovay
ba5ed2cce1
Merge \\\"docs: Describe how to update N Preview test devices on N release\\\" into nyc-dev am: 085b4e8f7b am: 9ef754c105
...
am: 3b6d0481c0
2016-07-15 23:34:59 +00:00
Makoto Onuki
d36651717e
Merge \\"Cache the default launcher.\\" into nyc-mr1-dev am: cf99263662
...
am: 6406be311c
2016-07-15 23:34:53 +00:00
Andreas Gampe
c13a5c92ef
Merge \\"Frameworks/base: Add compiler stats to Package Manager\\" into nyc-mr1-dev am: f52ce76d1f
...
am: a2bff32318
2016-07-15 23:34:46 +00:00
Ashutosh Joshi
d51413ec49
Merge \\"Loading NanoApps now works.\\" into nyc-mr1-dev am: 095979b463
...
am: 820ab55e1c
2016-07-15 23:28:28 +00:00
Cheryl Potter
05f863ea26
Merge \\\"docs: Add redirect for new AS Help menu item b/30165151\\\" into nyc-dev am: 462e5aae83 am: 8b9015899d
...
am: c2d6b29bdd
2016-07-15 23:28:26 +00:00
Cheryl Potter
658d47a9d9
Merge \\\"docs: Add redirect for new AS Help menu item b/30165151\\\" into nyc-dev am: 462e5aae83 am: c9515ae39d
...
am: cb8fbd4bea
2016-07-15 23:28:23 +00:00
Makoto Onuki
35dcfebd1e
Merge \\"Fix the allowed icon type error message\\" into nyc-mr1-dev am: fd57d549cf
...
am: 3e3f0f1ba8
2016-07-15 23:28:20 +00:00
Mike Tsao
b933b9acd6
Merge \\"Back up Night Light settings\\" into nyc-mr1-dev am: 9a0e444c22
...
am: d4584a8fb5
2016-07-15 23:28:17 +00:00
Andrew Solovay
98c9254381
Merge \"Merge \\\"docs: Updating image download pages for DP5\\\" into nyc-dev am: 84d59bc35d am: 37018626c9\" into nyc-mr1-dev-plus-aosp
...
am: eb9b6ed05e
2016-07-15 23:25:37 +00:00
Andrew Solovay
b3512ee3d8
Merge \\\"docs: Updating image download pages for DP5\\\" into nyc-dev am: 84d59bc35d am: 7005fff3f1
...
am: 0255dbb58d
2016-07-15 23:25:35 +00:00
Adrian Roos
7d7affe313
Merge \\"Doze: Add config for fine grained proximity checks\\" into nyc-mr1-dev am: 4ba23f30b5
...
am: e0cac111db
2016-07-15 23:25:31 +00:00
Adrian Roos
ab66a2cd5e
Merge \\"Notification: Apply small icon level\\" into nyc-mr1-dev am: 9d8de73530
...
am: 8b942b2404
2016-07-15 23:25:27 +00:00
Adrian Roos
5810a1c252
Merge \\"Add way to set live wallpaper across users\\" into nyc-mr1-dev am: 9a7c3bd577
...
am: 119840eb91
2016-07-15 23:25:19 +00:00
Dan Yu
4274dc65dc
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
2016-07-15 23:14:04 +00:00
Daniel Yu
915544654c
Merge \\\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\\" into nyc-dev am: 344a7375d7 am: 7b10126ed6
...
am: 79b1bb4878
2016-07-15 23:14:01 +00:00
Svetoslav Ganov
951f0e1d4d
Merge \\"Prevent apps to overlay other apps via toast windows\\" into nyc-mr1-dev am: e2d148b008
...
am: cd263d56d2
2016-07-15 23:13:59 +00:00
Jason Monk
82307574a8
Merge \\"Reduce contention of ApplicationsState locks\\" into nyc-mr1-dev am: 9e133205e3
...
am: b3bbcf256f
2016-07-15 23:13:56 +00:00
Vineeta Srivastava
bacc532874
Merge \\"Add carrier config to report IMEI on CDMA phone.\\" into nyc-mr1-dev am: a5b923bdd7
...
am: 199290cdab
2016-07-15 23:13:43 +00:00
Fan Zhang
a519938250
Merge "resolve merge conflicts of b9d34b3 to master"
2016-07-15 23:06:25 +00:00
Ben Lin
ea70d8d0d0
Merge "Fix a crash happening on a context menu."
2016-07-15 22:56:44 +00:00
Android Build Merger (Role)
8ff25378a0
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
2016-07-15 22:52:03 +00:00
Andrew Solovay
35f6be5014
Merge \\"docs: Describe how to update N Preview test devices on N release\\" into nyc-dev am: 085b4e8f7b
...
am: 64e25cf4d3
2016-07-15 22:51:27 +00:00
Andrew Solovay
3b6d0481c0
Merge \\"docs: Describe how to update N Preview test devices on N release\\" into nyc-dev am: 085b4e8f7b
...
am: 9ef754c105
2016-07-15 22:51:20 +00:00
Andrew Solovay
9ef754c105
Merge \"docs: Describe how to update N Preview test devices on N release\" into nyc-dev
...
am: 085b4e8f7b
2016-07-15 22:46:14 +00:00
Andrew Solovay
64e25cf4d3
Merge \"docs: Describe how to update N Preview test devices on N release\" into nyc-dev
...
am: 085b4e8f7b
2016-07-15 22:45:57 +00:00
TreeHugger Robot
085b4e8f7b
Merge "docs: Describe how to update N Preview test devices on N release" into nyc-dev
2016-07-15 22:42:28 +00:00
Makoto Onuki
6406be311c
Merge \"Cache the default launcher.\" into nyc-mr1-dev
...
am: cf99263662
2016-07-15 22:26:15 +00:00
Andreas Gampe
a2bff32318
Merge \"Frameworks/base: Add compiler stats to Package Manager\" into nyc-mr1-dev
...
am: f52ce76d1f
2016-07-15 22:26:09 +00:00
Makoto Onuki
cf99263662
Merge "Cache the default launcher." into nyc-mr1-dev
2016-07-15 22:22:34 +00:00
Ashutosh Joshi
820ab55e1c
Merge \"Loading NanoApps now works.\" into nyc-mr1-dev
...
am: 095979b463
2016-07-15 22:21:01 +00:00
TreeHugger Robot
f52ce76d1f
Merge "Frameworks/base: Add compiler stats to Package Manager" into nyc-mr1-dev
2016-07-15 22:20:38 +00:00
Cheryl Potter
c2d6b29bdd
Merge \\"docs: Add redirect for new AS Help menu item b/30165151\\" into nyc-dev am: 462e5aae83
...
am: 8b9015899d
2016-07-15 22:14:16 +00:00
Ashutosh Joshi
095979b463
Merge "Loading NanoApps now works." into nyc-mr1-dev
2016-07-15 22:12:42 +00:00
Cheryl Potter
cb8fbd4bea
Merge \\"docs: Add redirect for new AS Help menu item b/30165151\\" into nyc-dev am: 462e5aae83
...
am: c9515ae39d
2016-07-15 22:08:21 +00:00
Cheryl Potter
8b9015899d
Merge \"docs: Add redirect for new AS Help menu item b/30165151\" into nyc-dev
...
am: 462e5aae83
2016-07-15 22:07:16 +00:00
Cheryl Potter
c9515ae39d
Merge \"docs: Add redirect for new AS Help menu item b/30165151\" into nyc-dev
...
am: 462e5aae83
2016-07-15 22:02:12 +00:00
Cheryl Potter
462e5aae83
Merge "docs: Add redirect for new AS Help menu item b/30165151" into nyc-dev
2016-07-15 21:55:05 +00:00
Makoto Onuki
3e3f0f1ba8
Merge \"Fix the allowed icon type error message\" into nyc-mr1-dev
...
am: fd57d549cf
2016-07-15 21:50:46 +00:00
TreeHugger Robot
fd57d549cf
Merge "Fix the allowed icon type error message" into nyc-mr1-dev
2016-07-15 21:43:03 +00:00
Mike Tsao
d4584a8fb5
Merge \"Back up Night Light settings\" into nyc-mr1-dev
...
am: 9a0e444c22
2016-07-15 21:33:57 +00:00
Andrew Solovay
6cab8f571b
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
2016-07-15 14:29:35 -07:00
TreeHugger Robot
9a0e444c22
Merge "Back up Night Light settings" into nyc-mr1-dev
2016-07-15 21:28:34 +00:00
Android Build Merger (Role)
eb9b6ed05e
Merge "Merge \\"docs: Updating image download pages for DP5\\" into nyc-dev am: 84d59bc35d am: 37018626c9" into nyc-mr1-dev-plus-aosp
2016-07-15 21:23:03 +00:00
Andrew Solovay
a702cc882f
Merge \\"docs: Updating image download pages for DP5\\" into nyc-dev am: 84d59bc35d
...
am: 37018626c9
2016-07-15 21:22:38 +00:00
Andrew Solovay
0255dbb58d
Merge \\"docs: Updating image download pages for DP5\\" into nyc-dev am: 84d59bc35d
...
am: 7005fff3f1
2016-07-15 21:22:23 +00:00
Fan Zhang
f04fe0489f
resolve merge conflicts of b9d34b3 to master
...
Change-Id: Id88ecf373378f9ed7c18a3d2d84ab419dd033891
2016-07-15 14:21:47 -07:00
Adrian Roos
e0cac111db
Merge \"Doze: Add config for fine grained proximity checks\" into nyc-mr1-dev
...
am: 4ba23f30b5
2016-07-15 21:16:49 +00:00
Adrian Roos
8b942b2404
Merge \"Notification: Apply small icon level\" into nyc-mr1-dev
...
am: 9d8de73530
2016-07-15 21:16:41 +00:00
Adrian Roos
119840eb91
Merge \"Add way to set live wallpaper across users\" into nyc-mr1-dev
...
am: 9a7c3bd577
2016-07-15 21:16:36 +00:00
