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

Adarsh Fernando [Wed, 15 Jun 2016 03:57:32 +0000 (03:57 +0000)]

Merge \\\"Docs: Updated \\\'NDK Apps Linking to Platform Libraries\\\'\\\" into nyc-dev am: ab62c65da9 am: 0ff1462418
am: d27f2d86d5

Change-Id: I8b20441d5a91424d2899aba85748047e351e596b

commit | commitdiff | tree

Adarsh Fernando [Wed, 15 Jun 2016 03:52:14 +0000 (03:52 +0000)]

Merge \\"Docs: Updated \\'NDK Apps Linking to Platform Libraries\\'\\" into nyc-dev am: ab62c65da9
am: 0ff1462418

Change-Id: I28346acac8c7ff2272b5e3ac54af6704280d1652

commit | commitdiff | tree

Adarsh Fernando [Wed, 15 Jun 2016 03:48:16 +0000 (03:48 +0000)]

Merge \"Docs: Updated \'NDK Apps Linking to Platform Libraries\'\" into nyc-dev
am: ab62c65da9

Change-Id: I0033c391baf1bba245d9e970bad93970f4272703

commit | commitdiff | tree

Adarsh Fernando [Wed, 15 Jun 2016 03:43:14 +0000 (03:43 +0000)]

Merge "Docs: Updated 'NDK Apps Linking to Platform Libraries'" into nyc-dev

commit | commitdiff | tree

Andrew Solovay [Wed, 15 Jun 2016 03:42:53 +0000 (03:42 +0000)]

Merge \"Merge \\\"docs: Wording change for Support Lib 24.0 release notes\\\" into nyc-dev am: 3c5d725c86 am: cd9cea106e\" into nyc-mr1-dev-plus-aosp
am: 8c02c64d4b

Change-Id: I745fb4be2eea5c22d5eb54fd56a71ced5d45042a

commit | commitdiff | tree

Andrew Solovay [Wed, 15 Jun 2016 03:42:50 +0000 (03:42 +0000)]

Merge \\\"docs: Updating N preview release notes for DP4\\\" into nyc-dev am: 64df8c2d63 am: 6b17b407c4
am: f1ea3602d1

Change-Id: If634e1414919c8a33842f17fccbdae42f845d760

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 15 Jun 2016 03:37:31 +0000 (03:37 +0000)]

Merge "Merge \\"docs: Wording change for Support Lib 24.0 release notes\\" into nyc-dev am: 3c5d725c86 am: cd9cea106e" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Andrew Solovay [Wed, 15 Jun 2016 03:37:17 +0000 (03:37 +0000)]

Merge \"Merge \\\"docs: Updating N preview release notes for DP4\\\" into nyc-dev am: 64df8c2d63 am: 8a6ed4f214\" into nyc-mr1-dev-plus-aosp
am: 33140b2252

Change-Id: I95c6428cfb47c9e14465c165b6bf9e304ac44645

commit | commitdiff | tree

Andrew Solovay [Wed, 15 Jun 2016 03:37:15 +0000 (03:37 +0000)]

Merge \\\"docs: Updating N preview release notes for DP4\\\" into nyc-dev am: 64df8c2d63 am: 00592e5eae
am: 9fe2dd7ac6

Change-Id: I847012febea5ef906787c58f242e2b82f0aaeb96

commit | commitdiff | tree

Andrew Solovay [Wed, 15 Jun 2016 03:37:04 +0000 (03:37 +0000)]

Merge \\"docs: Wording change for Support Lib 24.0 release notes\\" into nyc-dev am: 3c5d725c86
am: cd9cea106e

Change-Id: I8e9dd522170921aa5e564a90770e2a7fc40064d0

commit | commitdiff | tree

Andrew Solovay [Wed, 15 Jun 2016 03:36:48 +0000 (03:36 +0000)]

Merge \\"docs: Updating N preview release notes for DP4\\" into nyc-dev am: 64df8c2d63
am: 6b17b407c4

Change-Id: I8af2bc9243aa92e7c14a247a644945569a96536e

commit | commitdiff | tree

Andrew Solovay [Wed, 15 Jun 2016 03:33:52 +0000 (03:33 +0000)]

Merge \"docs: Wording change for Support Lib 24.0 release notes\" into nyc-dev
am: 3c5d725c86

Change-Id: I0e89b944bdd259b06fcafbb0e1121119e208cea0

commit | commitdiff | tree

Andrew Solovay [Wed, 15 Jun 2016 03:33:51 +0000 (03:33 +0000)]

Merge \"docs: Wording change for Support Lib 24.0 release notes\" into nyc-dev
am: 3c5d725c86

Change-Id: Iafb4debc780be77d8cb97c5018e86dff0be391f4

commit | commitdiff | tree

Adarsh Fernando [Tue, 14 Jun 2016 03:33:27 +0000 (20:33 -0700)]

Docs: Updated 'NDK Apps Linking to Platform Libraries'

- updated compatibility with future platform releases
- expanded on ways to dignose and debug

Bug: 29215157
Change-Id: Ie63d024eac9914d4553419c734132696fb94d7e5

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 15 Jun 2016 03:32:32 +0000 (03:32 +0000)]

Merge "Merge \\"docs: Updating N preview release notes for DP4\\" into nyc-dev am: 64df8c2d63 am: 8a6ed4f214" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Andrew Solovay [Wed, 15 Jun 2016 03:32:07 +0000 (03:32 +0000)]

Merge \\"docs: Updating N preview release notes for DP4\\" into nyc-dev am: 64df8c2d63
am: 8a6ed4f214

Change-Id: I18d2a0af7c55eefb8eba30253bec1306e8a849ce

commit | commitdiff | tree

Andrew Solovay [Wed, 15 Jun 2016 03:31:55 +0000 (03:31 +0000)]

Merge \\"docs: Updating N preview release notes for DP4\\" into nyc-dev am: 64df8c2d63
am: 00592e5eae

Change-Id: Icdddf026bac9b0c6fc491a3ae7557bf2fb6dd7d9

commit | commitdiff | tree

Andrew Solovay [Wed, 15 Jun 2016 03:26:41 +0000 (03:26 +0000)]

Merge \"docs: Updating N preview release notes for DP4\" into nyc-dev
am: 64df8c2d63

Change-Id: I1df2178babe7b83c5de11dc69b5122315ed53e20

commit | commitdiff | tree

Andrew Solovay [Wed, 15 Jun 2016 03:26:27 +0000 (03:26 +0000)]

Merge \"docs: Updating N preview release notes for DP4\" into nyc-dev
am: 64df8c2d63

Change-Id: I07d256865659d839ce9cd417094c4e2741470475

commit | commitdiff | tree

TreeHugger Robot [Wed, 15 Jun 2016 03:24:07 +0000 (03:24 +0000)]

Merge "docs: Wording change for Support Lib 24.0 release notes" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 15 Jun 2016 03:15:29 +0000 (03:15 +0000)]

Merge "docs: Updating N preview release notes for DP4" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 15 Jun 2016 02:44:55 +0000 (02:44 +0000)]

Merge "Disabling fading icons when freeform mode is enabled."

commit | commitdiff | tree

David Friedman [Wed, 15 Jun 2016 01:57:47 +0000 (01:57 +0000)]

Merge \\\"Docs: Updated localizations for N Developer Preview docs.\\\" into nyc-dev am: 07af76b039 am: 0f1d38865f
am: 50d3a87e08

Change-Id: I6538b8ce7597c623c247f938420fa2b5483dd005

commit | commitdiff | tree

David Friedman [Wed, 15 Jun 2016 01:52:46 +0000 (01:52 +0000)]

Merge \\\"Docs: Updated localizations for N Developer Preview docs.\\\" into nyc-dev am: 07af76b039 am: 0e915af5f0
am: 8fbc619afb

Change-Id: I0775bf0562df3372bfbf1d66200585b7c778e4cb

commit | commitdiff | tree

David Friedman [Wed, 15 Jun 2016 01:52:44 +0000 (01:52 +0000)]

Merge \\"Docs: Updated localizations for N Developer Preview docs.\\" into nyc-dev am: 07af76b039
am: 0f1d38865f

Change-Id: I18d908baf378defe21d3152fdf1c1219bb3a567c

commit | commitdiff | tree

Todd Kennedy [Wed, 15 Jun 2016 01:52:43 +0000 (01:52 +0000)]

Merge \"Merge \\\"Update CTS shims\\\" into nyc-dev am: 6f140a249a am: f90ff6ef36\" into nyc-mr1-dev-plus-aosp
am: 6aec327b66

Change-Id: I96d946f6ef9fd37c09b002298dc030952a682432

commit | commitdiff | tree

Todd Kennedy [Wed, 15 Jun 2016 01:52:06 +0000 (01:52 +0000)]

Merge \\\"Update CTS shims\\\" into nyc-dev am: 6f140a249a am: 418fb41ac5
am: 0ab9545513

Change-Id: I7deef35deb7546af23ab38dd08a0ffe64788b329

commit | commitdiff | tree

David Friedman [Wed, 15 Jun 2016 01:49:04 +0000 (01:49 +0000)]

Merge \\"Docs: Updated localizations for N Developer Preview docs.\\" into nyc-dev am: 07af76b039
am: 0e915af5f0

Change-Id: I51087d9326bfb37e7dc320b57227cfd89efdd928

commit | commitdiff | tree

David Friedman [Wed, 15 Jun 2016 01:46:04 +0000 (01:46 +0000)]

Merge \"Docs: Updated localizations for N Developer Preview docs.\" into nyc-dev
am: 07af76b039

Change-Id: I19c01ced2d1ac4463c1e23462aebfbf761cf1bd7

commit | commitdiff | tree

David Friedman [Wed, 15 Jun 2016 01:45:29 +0000 (01:45 +0000)]

Merge \"Docs: Updated localizations for N Developer Preview docs.\" into nyc-dev
am: 07af76b039

Change-Id: I657201495113af3e3c08134f8aa9055519761086

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 15 Jun 2016 01:44:18 +0000 (01:44 +0000)]

Merge "Merge \\"Update CTS shims\\" into nyc-dev am: 6f140a249a am: f90ff6ef36" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Todd Kennedy [Wed, 15 Jun 2016 01:43:39 +0000 (01:43 +0000)]

Merge \\"Update CTS shims\\" into nyc-dev am: 6f140a249a
am: f90ff6ef36

Change-Id: I8c172ed1b7b31ae9d5e485423c4efa2fc19dae88

commit | commitdiff | tree

Todd Kennedy [Wed, 15 Jun 2016 01:43:35 +0000 (01:43 +0000)]

Merge \\"Update CTS shims\\" into nyc-dev am: 6f140a249a
am: 418fb41ac5

Change-Id: I07b451a209d5b713420b1fd86ee3d6dee508bc41

commit | commitdiff | tree

David Friedman [Wed, 15 Jun 2016 01:39:40 +0000 (01:39 +0000)]

Merge "Docs: Updated localizations for N Developer Preview docs." into nyc-dev

commit | commitdiff | tree

Todd Kennedy [Wed, 15 Jun 2016 01:35:17 +0000 (01:35 +0000)]

Merge \"Update CTS shims\" into nyc-dev
am: 6f140a249a

Change-Id: I6746c7b2484398787dc29fb9a67cba88b79ad74d

commit | commitdiff | tree

David Friedman [Wed, 15 Jun 2016 01:14:49 +0000 (18:14 -0700)]

Docs: Updated localizations for N Developer Preview docs.

Bug: 28912213

Change-Id: I8ff0dd5989863ce4097e2290ff9a10e4cc5789ec

commit | commitdiff | tree

Todd Kennedy [Wed, 15 Jun 2016 01:35:09 +0000 (01:35 +0000)]

Merge \"Update CTS shims\" into nyc-dev
am: 6f140a249a

Change-Id: I46a95ea5eb9199c63e8f0a62ddf7c6eac149147d

commit | commitdiff | tree

Winson [Wed, 15 Jun 2016 01:31:37 +0000 (01:31 +0000)]

Merge \"Merge \\\"Only skip trimming task if the stacks are not null.\\\" into nyc-dev am: 6ba96df815 am: f9eed3bf86\" into nyc-mr1-dev-plus-aosp
am: 875debe401

Change-Id: I8ab7e1cd1bb8bc03a0326e431338d223f98e2bfa

commit | commitdiff | tree

Sudheer Shanka [Wed, 15 Jun 2016 01:31:35 +0000 (01:31 +0000)]

Merge \"Merge \\\"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\\\" into nyc-dev am: 159c13801b am: 5df969f778\" into nyc-mr1-dev-plus-aosp
am: aee4d8a058

Change-Id: I473c36a921e70044730d5be2b01bf1d41a4ff017

commit | commitdiff | tree

David Friedman [Wed, 15 Jun 2016 01:29:45 +0000 (01:29 +0000)]

Merge \"Merge \\\"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\\\" into nyc-dev am: ea1f3cb5c3 am: f93ef9d4bc\" into nyc-mr1-dev-plus-aosp
am: ab26de73b0

Change-Id: I2fa3ea2e7cea0ee33f5ff5a62473ab0ae7cec5ca

commit | commitdiff | tree

TreeHugger Robot [Wed, 15 Jun 2016 01:29:41 +0000 (01:29 +0000)]

Merge "Update CTS shims" into nyc-dev

commit | commitdiff | tree

Winson [Wed, 15 Jun 2016 01:29:42 +0000 (01:29 +0000)]

Merge \\\"Only skip trimming task if the stacks are not null.\\\" into nyc-dev am: 6ba96df815 am: f654d3e081
am: 87cff0ba08

Change-Id: Ieec94ccf440a737e39551f5b264509d017ec9665

commit | commitdiff | tree

Sudheer Shanka [Wed, 15 Jun 2016 01:29:39 +0000 (01:29 +0000)]

Merge \\\"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\\\" into nyc-dev am: 159c13801b am: 1f096663e8
am: b8d43da675

Change-Id: I63872a15b30d5fc7fede187019d01aa26cf3c68f

commit | commitdiff | tree

David Friedman [Wed, 15 Jun 2016 01:29:36 +0000 (01:29 +0000)]

Merge \\\"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\\\" into nyc-dev am: ea1f3cb5c3 am: ee13234773
am: 91140eb466

Change-Id: I8c136acf3675a2d2771cf811aa61628254f17310

commit | commitdiff | tree

Robert Carr [Wed, 15 Jun 2016 01:29:33 +0000 (01:29 +0000)]

Merge \\\"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\\\" into nyc-dev am: 3e5df9fb50 am: 5077dd948f
am: e4a0fa46dd

Change-Id: Ib3c6e985e170e3ebdfa72f4de0dc6cd8d3fac08b

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 15 Jun 2016 01:26:43 +0000 (01:26 +0000)]

Merge "Merge \\"Only skip trimming task if the stacks are not null.\\" into nyc-dev am: 6ba96df815 am: f9eed3bf86" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 15 Jun 2016 01:26:33 +0000 (01:26 +0000)]

Merge "Merge \\"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\\" into nyc-dev am: 159c13801b am: 5df969f778" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 15 Jun 2016 01:26:25 +0000 (01:26 +0000)]

Merge "Merge \\"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\\" into nyc-dev am: ea1f3cb5c3 am: f93ef9d4bc" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Winson [Wed, 15 Jun 2016 01:25:56 +0000 (01:25 +0000)]

Merge \\"Only skip trimming task if the stacks are not null.\\" into nyc-dev am: 6ba96df815
am: f9eed3bf86

Change-Id: I1ff302336f1ddd2178e71de126441f08bb13ffa9

commit | commitdiff | tree

Sudheer Shanka [Wed, 15 Jun 2016 01:25:54 +0000 (01:25 +0000)]

Merge \\"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\\" into nyc-dev am: 159c13801b
am: 5df969f778

Change-Id: I0ddce3fb5087a2deae54dd676313a9b77156e397

commit | commitdiff | tree

David Friedman [Wed, 15 Jun 2016 01:25:51 +0000 (01:25 +0000)]

Merge \\"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\\" into nyc-dev am: ea1f3cb5c3
am: f93ef9d4bc

Change-Id: Ifcc0fba668ca8a8fd4bf77bb4c525fcc4e2ea07e

commit | commitdiff | tree

Robert Carr [Wed, 15 Jun 2016 01:25:40 +0000 (01:25 +0000)]

Merge \\\"Unbreak Javadoc on getAttestationChallenge()\\\" into nyc-dev am: 2c2f8acdab am: 31eece5af9
am: 3cff553f3a

Change-Id: Ifb518a33e93dfdeb86233c0a063fa32703d3e448

commit | commitdiff | tree

Winson [Wed, 15 Jun 2016 01:24:59 +0000 (01:24 +0000)]

Merge \\"Only skip trimming task if the stacks are not null.\\" into nyc-dev am: 6ba96df815
am: f654d3e081

Change-Id: I08322a664374d16829f87391c913e0aba44f3cfb

commit | commitdiff | tree

Andrew Solovay [Wed, 15 Jun 2016 01:21:22 +0000 (18:21 -0700)]

docs: Wording change for Support Lib 24.0 release notes

See first comment for doc stage location.

bug: 29215447
Change-Id: I75b1dc88e19e557c9ffee6336bfc342a17d1271f

commit | commitdiff | tree

Sudheer Shanka [Wed, 15 Jun 2016 01:20:30 +0000 (01:20 +0000)]

Merge \\"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\\" into nyc-dev am: 159c13801b
am: 1f096663e8

Change-Id: I10f0d321d246ec70fc55b38c9f6a43dcf3280f0e

commit | commitdiff | tree

David Friedman [Wed, 15 Jun 2016 01:20:27 +0000 (01:20 +0000)]

Merge \\"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\\" into nyc-dev am: ea1f3cb5c3
am: ee13234773

Change-Id: I21ee8eb3586e8c085c6d0d048233a4383f889072

commit | commitdiff | tree

Robert Carr [Wed, 15 Jun 2016 01:20:20 +0000 (01:20 +0000)]

Merge \\"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\\" into nyc-dev am: 3e5df9fb50
am: 5077dd948f

Change-Id: Iebfc46bb349456e11937fdfa82a8fe6a5a15d950

commit | commitdiff | tree

Shawn Willden [Wed, 15 Jun 2016 01:16:07 +0000 (01:16 +0000)]

Merge \"Merge \\\"Unbreak Javadoc on getAttestationChallenge()\\\" into nyc-dev am: 2c2f8acdab am: 2da8166a68\" into nyc-mr1-dev-plus-aosp
am: 0dc04c0d2b

Change-Id: I528383942dae9bf443ed0363a61cbe0f7e4e674e

commit | commitdiff | tree

Shawn Willden [Wed, 15 Jun 2016 01:16:05 +0000 (01:16 +0000)]

Merge \\\"Unbreak Javadoc on getAttestationChallenge()\\\" into nyc-dev am: 2c2f8acdab am: 6bc69459ed
am: 6cbb70ebf1

Change-Id: I7731abb8eb2048b9e2d2640406d5b55fdc886bc1

commit | commitdiff | tree

Winson [Wed, 15 Jun 2016 01:16:03 +0000 (01:16 +0000)]

Merge \"Only skip trimming task if the stacks are not null.\" into nyc-dev
am: 6ba96df815

Change-Id: I6551328b80a849013ea121ded03333e2a9475145

commit | commitdiff | tree

Winson [Wed, 15 Jun 2016 01:16:02 +0000 (01:16 +0000)]

Merge \"Only skip trimming task if the stacks are not null.\" into nyc-dev
am: 6ba96df815

Change-Id: I58b230bb33330fbb130094cc937c4aeaf5976baa

commit | commitdiff | tree

Shawn Willden [Wed, 15 Jun 2016 01:15:44 +0000 (01:15 +0000)]

Merge \\"Unbreak Javadoc on getAttestationChallenge()\\" into nyc-dev am: 2c2f8acdab
am: 31eece5af9

Change-Id: Ib802115dde54f3fdaee73e42b0376318f944cc1e

commit | commitdiff | tree

Sudheer Shanka [Wed, 15 Jun 2016 01:12:21 +0000 (01:12 +0000)]

Merge \"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\" into nyc-dev
am: 159c13801b

Change-Id: Ic83a0ae31afac6b94fcfba8ceee986326fb300ab

commit | commitdiff | tree

David Friedman [Wed, 15 Jun 2016 01:12:19 +0000 (01:12 +0000)]

Merge \"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\" into nyc-dev
am: ea1f3cb5c3

Change-Id: Ib6e5fd941a3b091274fc5af2428f4a567abb5b69

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 15 Jun 2016 01:12:18 +0000 (01:12 +0000)]

Merge "Merge \\"Unbreak Javadoc on getAttestationChallenge()\\" into nyc-dev am: 2c2f8acdab am: 2da8166a68" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Robert Carr [Wed, 15 Jun 2016 01:12:17 +0000 (01:12 +0000)]

Merge \"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\" into nyc-dev
am: 3e5df9fb50

Change-Id: I59d035329b3e6acbc929564ba7ce1107943c6587

commit | commitdiff | tree

Sudheer Shanka [Wed, 15 Jun 2016 01:12:11 +0000 (01:12 +0000)]

Merge \"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\" into nyc-dev
am: 159c13801b

Change-Id: Ic4d94327a21f2a8b8ae175e057039eafb9c2d698

commit | commitdiff | tree

David Friedman [Wed, 15 Jun 2016 01:12:07 +0000 (01:12 +0000)]

Merge \"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\" into nyc-dev
am: ea1f3cb5c3

Change-Id: Ia61b3fd592e19c7fb021b0f22e3eeb8bbc6b5b4f

commit | commitdiff | tree

Robert Carr [Wed, 15 Jun 2016 01:12:03 +0000 (01:12 +0000)]

Merge \"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\" into nyc-dev
am: 3e5df9fb50

Change-Id: I97742b1d180ff1c38a1aa7ea0a13c981a38c1df3

commit | commitdiff | tree

Shawn Willden [Wed, 15 Jun 2016 01:11:57 +0000 (01:11 +0000)]

Merge \\"Unbreak Javadoc on getAttestationChallenge()\\" into nyc-dev am: 2c2f8acdab
am: 2da8166a68

Change-Id: I14d955073b1093199d05ea7f4f431bc1b74f81f7

commit | commitdiff | tree

Shawn Willden [Wed, 15 Jun 2016 01:11:44 +0000 (01:11 +0000)]

Merge \\"Unbreak Javadoc on getAttestationChallenge()\\" into nyc-dev am: 2c2f8acdab
am: 6bc69459ed

Change-Id: I9fdafe59c549cd8a9cf15e7f05d0aad446954bab

commit | commitdiff | tree

Andrew Solovay [Tue, 14 Jun 2016 21:38:32 +0000 (14:38 -0700)]

docs: Updating N preview release notes for DP4

See first comment for doc stage location.

bug: 28982873
Change-Id: I692b361f4a0d2d3627fa8cea19082fc24306f470

commit | commitdiff | tree

TreeHugger Robot [Wed, 15 Jun 2016 01:08:57 +0000 (01:08 +0000)]

Merge "Only skip trimming task if the stacks are not null." into nyc-dev

commit | commitdiff | tree

Shawn Willden [Wed, 15 Jun 2016 01:05:26 +0000 (01:05 +0000)]

Merge \"Unbreak Javadoc on getAttestationChallenge()\" into nyc-dev
am: 2c2f8acdab

Change-Id: I89b9c88159f99681049ce401f22ca9ea8578b27c

commit | commitdiff | tree

Chris Thornton [Wed, 15 Jun 2016 01:05:12 +0000 (01:05 +0000)]

Merge \\"Prevent NPE when updating models without a vendor UUID\\" into nyc-mr1-dev am: ad5c30bdb2
am: 7d07319673

Change-Id: Iffe0716e74dfcabe1957960ff639352929ec6ae3

commit | commitdiff | tree

Shawn Willden [Wed, 15 Jun 2016 01:04:48 +0000 (01:04 +0000)]

Merge \"Unbreak Javadoc on getAttestationChallenge()\" into nyc-dev
am: 2c2f8acdab

Change-Id: Id639d2ce9ac95fc1a0a87048e5b3f8b8137c5fdd

commit | commitdiff | tree

TreeHugger Robot [Wed, 15 Jun 2016 01:02:32 +0000 (01:02 +0000)]

Merge "Allow apps with CREATE_USERS permission to call UM.getUserInfo." into nyc-dev

commit | commitdiff | tree

Chris Thornton [Wed, 15 Jun 2016 01:00:29 +0000 (01:00 +0000)]

Merge \"Prevent NPE when updating models without a vendor UUID\" into nyc-mr1-dev
am: ad5c30bdb2

Change-Id: I11f22f6f265564184cd22fd3286ebcf6b9e488e5

commit | commitdiff | tree

David Friedman [Wed, 15 Jun 2016 00:59:52 +0000 (00:59 +0000)]

Merge "Docs: Adds SurfaceView to API Overview page for Android-N DP4." into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 15 Jun 2016 00:59:19 +0000 (00:59 +0000)]

Merge "Toast timeout: Just strip FLAG_KEEP_SCREEN_ON" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 15 Jun 2016 00:56:45 +0000 (00:56 +0000)]

Merge "Unbreak Javadoc on getAttestationChallenge()" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 15 Jun 2016 00:56:29 +0000 (00:56 +0000)]

Merge "Prevent NPE when updating models without a vendor UUID" into nyc-mr1-dev

commit | commitdiff | tree

David Friedman [Tue, 14 Jun 2016 22:37:16 +0000 (15:37 -0700)]

Docs: Adds SurfaceView to API Overview page for Android-N DP4.

Change-Id: I29854c82ef788b00c1ebc305bc5faf463c2d8dc8

commit | commitdiff | tree

Dirk Dougherty [Wed, 15 Jun 2016 00:49:20 +0000 (00:49 +0000)]

Merge \\\"Add API 24 to reference selector.\\\" into nyc-dev am: 398d088871 am: 8d129efa23
am: fc0aed25b0

Change-Id: If15cfbf21c8859934f66389632be8f7949b4a2d4

commit | commitdiff | tree

Winson [Wed, 15 Jun 2016 00:35:53 +0000 (17:35 -0700)]

Disabling fading icons when freeform mode is enabled.

Bug: 28398344
Change-Id: If0c38c10153f490a7443ce36b0a5d17bb685b1a8

commit | commitdiff | tree

Dirk Dougherty [Wed, 15 Jun 2016 00:44:18 +0000 (00:44 +0000)]

Merge \\\"Add API 24 to reference selector.\\\" into nyc-dev am: 398d088871 am: f44feb36b0
am: f992a2af12

Change-Id: Ie77f470408603acddb50a39738003dfa407b7183

commit | commitdiff | tree

Dirk Dougherty [Wed, 15 Jun 2016 00:44:09 +0000 (00:44 +0000)]

Merge \\"Add API 24 to reference selector.\\" into nyc-dev am: 398d088871
am: 8d129efa23

Change-Id: If1d947f8bebf5ddf5f65d518d2db34c1549656a9

commit | commitdiff | tree

Dirk Dougherty [Wed, 15 Jun 2016 00:34:01 +0000 (00:34 +0000)]

Merge \\"Add API 24 to reference selector.\\" into nyc-dev am: 398d088871
am: f44feb36b0

Change-Id: Iff60df549779cd1155a7bfeeb74aca5e546a31ad

commit | commitdiff | tree

Dirk Dougherty [Wed, 15 Jun 2016 00:28:07 +0000 (00:28 +0000)]

Merge \"Add API 24 to reference selector.\" into nyc-dev
am: 398d088871

Change-Id: I922cb82b69a13913d83280d1003e292528bdfd88

commit | commitdiff | tree

Dirk Dougherty [Wed, 15 Jun 2016 00:28:03 +0000 (00:28 +0000)]

Merge \"Add API 24 to reference selector.\" into nyc-dev
am: 398d088871

Change-Id: I51a61188186026eac5c12f3b0d0ec52eebf60f38

commit | commitdiff | tree

Dirk Dougherty [Wed, 15 Jun 2016 00:20:26 +0000 (00:20 +0000)]

Merge "Add API 24 to reference selector." into nyc-dev

commit | commitdiff | tree

Todd Kennedy [Wed, 15 Jun 2016 00:07:56 +0000 (00:07 +0000)]

Merge \\"New API w/ multiple prefixes\\" into nyc-mr1-dev am: d07b87cb1c
am: 162b74a6fd

Change-Id: I81d79930c6d3d42be61a9ab1cdb5f29d677cd3de

commit | commitdiff | tree

Todd Kennedy [Wed, 15 Jun 2016 00:03:12 +0000 (00:03 +0000)]

Merge \"New API w/ multiple prefixes\" into nyc-mr1-dev
am: d07b87cb1c

Change-Id: I3296ac4343cfedb5b88470963cb4671e9e3427f6

commit | commitdiff | tree

Dirk Dougherty [Wed, 15 Jun 2016 00:02:18 +0000 (00:02 +0000)]

Merge \\\"Doc change: add diffs for 23->24.\\\" into nyc-dev am: 70e358b017 am: c3c0e94e59
am: cdf8b9ed94

Change-Id: I5bdc5f2446ab948c23f50498e1ab9c789c8e15ab

commit | commitdiff | tree

Dirk Dougherty [Wed, 15 Jun 2016 00:02:15 +0000 (00:02 +0000)]

Merge \\\"Doc change: add diffs for 23->24.\\\" into nyc-dev am: 70e358b017 am: a581e78678
am: 7b368864f6

Change-Id: Iee6e1af104758f6ebd0a734dfa06cd9aa342cb7b

commit | commitdiff | tree

Dirk Dougherty [Tue, 14 Jun 2016 23:57:49 +0000 (23:57 +0000)]

Merge \\"Doc change: add diffs for 23->24.\\" into nyc-dev am: 70e358b017
am: c3c0e94e59

Change-Id: I775a41ef489097ec836f8dcbcf7b51bd6224da81

commit | commitdiff | tree

Todd Kennedy [Tue, 14 Jun 2016 23:57:17 +0000 (23:57 +0000)]

Merge "New API w/ multiple prefixes" into nyc-mr1-dev

commit | commitdiff | tree

Dirk Dougherty [Tue, 14 Jun 2016 23:55:13 +0000 (23:55 +0000)]

Merge \\"Doc change: add diffs for 23->24.\\" into nyc-dev am: 70e358b017
am: a581e78678

Change-Id: I9abf820074d7a1a1abb04351ebfb25a74a9fc50f

commit | commitdiff | tree

Dirk Dougherty [Tue, 14 Jun 2016 23:52:03 +0000 (23:52 +0000)]

Merge \"Doc change: add diffs for 23->24.\" into nyc-dev
am: 70e358b017

Change-Id: I54efbc44f2cea31f575c89a3543f571540653a15

commit | commitdiff | tree

Dirk Dougherty [Tue, 14 Jun 2016 23:51:55 +0000 (23:51 +0000)]

Merge \"Doc change: add diffs for 23->24.\" into nyc-dev
am: 70e358b017

Change-Id: I51b151fce31f891d6ab61f48d094ea56fa0da817