Amith Yamasani
d0cecf9d67
Merge \"Block camera gesture during secondary user SUW\" into nyc-mr1-dev
...
am: e1a3a449a4
2016-07-16 00:12:03 +00:00
Steve McKay
a8387db55e
Merge \"Include an app icon.\" into nyc-mr1-dev
...
am: 3d8c9981b5
2016-07-16 00:06:10 +00:00
TreeHugger Robot
e1a3a449a4
Merge "Block camera gesture during secondary user SUW" into nyc-mr1-dev
2016-07-16 00:03:52 +00:00
TreeHugger Robot
3d8c9981b5
Merge "Include an app icon." into nyc-mr1-dev
2016-07-15 23:59:46 +00:00
Doris Liu
f5b87ce908
Merge \"Ensure native allocation/free is correctly registered\" into nyc-mr1-dev
...
am: a7272b4cad
2016-07-15 23:56:24 +00:00
Makoto Onuki
3d3e2e2b17
Merge \"Don\'t accept resource references in string fields\" into nyc-mr1-dev
...
am: 6fa0e4d518
2016-07-15 23:50:51 +00:00
Doris Liu
a7272b4cad
Merge "Ensure native allocation/free is correctly registered" into nyc-mr1-dev
2016-07-15 23:46:08 +00:00
Makoto Onuki
6fa0e4d518
Merge "Don't accept resource references in string fields" into nyc-mr1-dev
2016-07-15 23:41:11 +00:00
Android Build Merger (Role)
40a4bf7dc1
Merge "Merge \"Build both filename views before deleting.\" into nyc-mr1-dev am: fff6a11438" into nyc-mr1-dev-plus-aosp
2016-07-15 23:16:57 +00:00
Jeff Sharkey
ab062fc81f
Merge \"Build both filename views before deleting.\" into nyc-mr1-dev
...
am: fff6a11438
2016-07-15 23:16:35 +00:00
Andrew Solovay
64c147b2cd
Merge \\"docs: Updating N Preview release notes for DP5\\" into nyc-dev am: b91693fedd
...
am: 5de36f1ba0
2016-07-15 23:15:57 +00:00
Andrew Solovay
91eaa3ec0e
Merge \\"docs: Updating N Preview release notes for DP5\\" into nyc-dev am: b91693fedd
...
am: e4846ae107
2016-07-15 23:10:58 +00:00
TreeHugger Robot
fff6a11438
Merge "Build both filename views before deleting." into nyc-mr1-dev
2016-07-15 23:05:15 +00:00
Andrew Solovay
5de36f1ba0
Merge \"docs: Updating N Preview release notes for DP5\" into nyc-dev
...
am: b91693fedd
2016-07-15 22:55:38 +00:00
Andrew Solovay
e4846ae107
Merge \"docs: Updating N Preview release notes for DP5\" into nyc-dev
...
am: b91693fedd
2016-07-15 22:55:37 +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
b91693fedd
Merge "docs: Updating N Preview release notes for DP5" into nyc-dev
2016-07-15 22:46:51 +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
Steve McKay
f00c161a22
Include an app icon.
...
Bug: 29880363
Change-Id: Ia8d9414ce536fb35acec1357d0f69d3ee158d853
2016-07-15 15:37:14 -07:00
Amith Yamasani
f16c3be10f
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
2016-07-15 15:33:03 -07: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
Jeff Sharkey
c50875e42e
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
2016-07-15 15:34:44 -06: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
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
Andrew Solovay
7005fff3f1
Merge \"docs: Updating image download pages for DP5\" into nyc-dev
...
am: 84d59bc35d
2016-07-15 21:16:12 +00:00
Andrew Solovay
37018626c9
Merge \"docs: Updating image download pages for DP5\" into nyc-dev
...
am: 84d59bc35d
2016-07-15 21:16:06 +00:00
Adrian Roos
4ba23f30b5
Merge "Doze: Add config for fine grained proximity checks" into nyc-mr1-dev
2016-07-15 21:09:51 +00:00
