OSDN Git Service
Dirk Dougherty [Mon, 18 Jul 2016 15:15:40 +0000 (15:15 +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
am:
8ec41f0c99
Change-Id: I6df83ca4ee10227acdbc49970c54a84a390162ce
Lorenzo Colitti [Mon, 18 Jul 2016 15:15:33 +0000 (15:15 +0000)]
Merge \"Merge \\"Add an isListen method to NetworkRequests.\\" into nyc-mr1-dev am:
b5239329b1\" into nyc-mr1-dev-plus-aosp
am:
17450e41b3
Change-Id: Ic71a5722ee877de73e7ffd340a5ffb84a2d4910d
Dirk Dougherty [Mon, 18 Jul 2016 15:15:23 +0000 (15:15 +0000)]
Merge \\\"Doc change: updates for DP5 release notes.\\\" into nyc-dev am:
e92ebf666e am:
edf16d6d4b
am:
822f118c24
Change-Id: I4b331c7a23dd929603658112d319a3d3257d6645
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
Alan Viverette [Mon, 18 Jul 2016 15:09:00 +0000 (15:09 +0000)]
Merge \\"Use \\"real\\" display size for computing available densities\\" into nyc-mr1-dev am:
ad126d3b8b
am:
e236079acb
Change-Id: I3c2145349415dfda8f4e1ce6b997f36ff84eea86
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
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
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:36:56 +0000 (14:36 +0000)]
Merge \\"Do not allow to disable package \\"android\\"\\" into nyc-mr1-dev am:
a5111bfda4
am:
e9e9f30085
Change-Id: I6159402639a440849357bd4ccd53bc4cb8fbab7a
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
Julia Reynolds [Mon, 18 Jul 2016 13:40:06 +0000 (13:40 +0000)]
Merge \"Merge \\\"Check uid for notification policy access.\\\" into nyc-dev am:
8f17d2a48b am:
5710e91931\" into nyc-mr1-dev-plus-aosp
am:
1ae7b3e1be
Change-Id: I9bbe363815faeb55398a9914f81dc84eb49ce09e
Julia Reynolds [Mon, 18 Jul 2016 13:40:03 +0000 (13:40 +0000)]
Merge \\\"Check uid for notification policy access.\\\" into nyc-dev am:
8f17d2a48b am:
5921f81724
am:
31ebd4ed30
Change-Id: I4abc8b2654daca9dd88a0e2a7acca63bc1d7484f
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
Derek Sollenberger [Mon, 18 Jul 2016 12:07:42 +0000 (12:07 +0000)]
Merge changes from topic 'skia_merge'
* changes:
Fix include to match Skia filename change
Remove references to SkImageDecoder (part 2)
Update SkiaCanvasProxy with SkSurface API change
Return DNG mimeType for the case kDNG_SkEncodedFormat
Remove use of SkFixed. Update code to use SkGlyph.fAdvance[XY] after https://codereview.chromium.org/
1737693006.
skia SkDocument - new MakePDF API, fix leak
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
Andrei Stingaceanu [Mon, 18 Jul 2016 09:39:51 +0000 (09:39 +0000)]
Merge "Keyboard shortcuts: minor Activity broadcast refactor"
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:26:40 +0000 (18:26 +0000)]
Merge \\"FloatingActionMode: Fix screen coordinates.\\" into nyc-mr1-dev am:
3b8e0fdf92
am:
c749762107
Change-Id: If82be88fcf267aef7f239e9ab30e3e594fcf945e
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:29:44 +0000 (19:29 +0000)]
Merge \\"Make sure StrictMode allows disk reads when calling isThreadInProcess.\\" into nyc-mr1-dev am:
afa67f3d34
am:
62547293e3
Change-Id: Idc39bd967dfc45c9d66aaf5f28e1012c4c15bd78
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:44:06 +0000 (02:44 +0000)]
Merge \\"Deprecate Resources constructor and updateConfiguration() method\\" into nyc-mr1-dev am:
c3829f528e
am:
6a9f651b73
Change-Id: I27261451c872502b5f240f1e68fdd092fa9e5e67
Andreas Gampe [Sat, 16 Jul 2016 02:43:56 +0000 (02:43 +0000)]
Frameworks/base: Fix braino missing line am:
06eb24d95e
am:
46d5eca989
Change-Id: I6cdcd67e7bed24819eac5e11fc775ef8f243a8e0
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
Robert Shih [Sat, 16 Jul 2016 01:33:50 +0000 (18:33 -0700)]
MediaRecorder: fix OnInfo related documentation
The original documentation said MediaRecorder.OnInfoListener was called for
error cases.
Bug:
25424209
Change-Id: Ic8d2dee67b15a64604a959e7e6964436da92d6ba
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
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
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
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: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
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
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
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
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
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
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
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
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: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
OSDN Git Service
