OSDN Git Service
Andrew Solovay [Mon, 18 Jul 2016 17:54:59 +0000 (17:54 +0000)]
Merge \"Merge \\"Merge \\\"docs: Added support library 24.1.0\\\" into nyc-dev am:
872ecfb0bf\\" into nyc-mr1-dev am:
c024e480ab\" into nyc-mr1-dev-plus-aosp
am:
7c3b9e2f8c
Change-Id: I24b4eec0e2ef79a53e89abc5a4dd0210393e2826
Andrew Solovay [Mon, 18 Jul 2016 17:54:57 +0000 (17:54 +0000)]
Merge \"Merge \\\"docs: Added support library 24.1.0\\\" into nyc-dev am:
872ecfb0bf am:
965c66b41b\" into nyc-mr1-dev-plus-aosp
am:
4a2ea7008f
Change-Id: I72c8f95b16217c2b4a8f2ef2804d4618889b98ca
Chris Tate [Mon, 18 Jul 2016 17:54:54 +0000 (17:54 +0000)]
Merge \\"Document that WallpaperManager.getDrawable() can return null\\" into nyc-mr1-dev am:
3cec9d44b3
am:
ca0e0b9b6c
Change-Id: Id27ec9541d4075f80a546d3df2bfd7577e38f0fc
Android Build Merger (Role) [Mon, 18 Jul 2016 17:44:49 +0000 (17:44 +0000)]
Merge "Merge \"Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am:
872ecfb0bf\" into nyc-mr1-dev am:
c024e480ab" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 18 Jul 2016 17:44:43 +0000 (17:44 +0000)]
Merge "Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am:
872ecfb0bf am:
965c66b41b" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Mon, 18 Jul 2016 17:44:21 +0000 (17:44 +0000)]
Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am:
872ecfb0bf
am:
965c66b41b
Change-Id: I510d983c9f84e2679f1237566396cdf93e85890a
Andrew Solovay [Mon, 18 Jul 2016 17:44:12 +0000 (17:44 +0000)]
Merge \"Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am:
872ecfb0bf\" into nyc-mr1-dev
am:
c024e480ab
Change-Id: I3d46dd6d160fb23702db36b5ce9090d8a6b32b6e
Christopher Tate [Mon, 18 Jul 2016 17:44:04 +0000 (17:44 +0000)]
Merge \"Document that WallpaperManager.getDrawable() can return null\" into nyc-mr1-dev
am:
3cec9d44b3
Change-Id: I72443aa4360cb4c22c9b4faf0cf98b395097757f
Andrew Solovay [Mon, 18 Jul 2016 17:37:22 +0000 (17:37 +0000)]
Merge \"docs: Added support library 24.1.0\" into nyc-dev
am:
872ecfb0bf
Change-Id: Ibfcaf05e0bcc73c5c8b1d096553d2a9e042d7300
Chong Zhang [Mon, 18 Jul 2016 17:30:51 +0000 (17:30 +0000)]
Merge "Remove two-finger scroll specific code"
Chong Zhang [Fri, 15 Jul 2016 18:28:17 +0000 (11:28 -0700)]
Remove two-finger scroll specific code
Revert changes in ag/845161, ag/843943 and ag/817515 that's added
specifically for two-finger scroll mode.
Change-Id: I8679a3bd5b3907180d33d99e3a071e7edfb2ed96
Tejas Khorana [Mon, 18 Jul 2016 17:29:48 +0000 (17:29 +0000)]
Merge "indexOfValueByValue now uses .equals"
Android Build Merger (Role) [Mon, 18 Jul 2016 17:29:41 +0000 (17:29 +0000)]
Merge "Merge \"docs: Added support library 24.1.0\" into nyc-dev am:
872ecfb0bf" into nyc-mr1-dev
Chris Tate [Mon, 18 Jul 2016 17:29:37 +0000 (17:29 +0000)]
Merge "Document that WallpaperManager.getDrawable() can return null" into nyc-mr1-dev
Andrew Solovay [Mon, 18 Jul 2016 17:29:02 +0000 (17:29 +0000)]
Merge \"docs: Added support library 24.1.0\" into nyc-dev
am:
872ecfb0bf
Change-Id: I6ba46b8efcc8567d6192ac274e08ed1489cb0c2e
Felipe Leme [Mon, 18 Jul 2016 17:25:56 +0000 (17:25 +0000)]
Merge "Added missing copyright notice."
Andrew Solovay [Mon, 18 Jul 2016 17:16:59 +0000 (17:16 +0000)]
Merge "docs: Added support library 24.1.0" into nyc-dev
Dirk Dougherty [Mon, 18 Jul 2016 15:33:03 +0000 (15:33 +0000)]
Merge \"Doc change: updated issues in DP5 release notes. am:
73b700404c am:
142c4f7a9f\" into nyc-mr1-dev-plus-aosp
am:
8f90ec2c82
Change-Id: I52ccd61e8fe251b5434cd231552ccfef887fe37a
Dirk Dougherty [Mon, 18 Jul 2016 15:33:00 +0000 (15:33 +0000)]
Doc change: updated issues in DP5 release notes. am:
73b700404c am:
3061ceaf82
am:
1eee792833
Change-Id: I72609701a85aa8baf4118958fb4b8283b5d903f7
Android Build Merger (Role) [Mon, 18 Jul 2016 15:28:33 +0000 (15:28 +0000)]
Merge "Doc change: updated issues in DP5 release notes. am:
73b700404c am:
142c4f7a9f" into nyc-mr1-dev-plus-aosp
Dirk Dougherty [Mon, 18 Jul 2016 15:28:03 +0000 (15:28 +0000)]
Doc change: updated issues in DP5 release notes. am:
73b700404c
am:
142c4f7a9f
Change-Id: I13a07cd7b525f5bb1fa1f599f0f3ec0ebaa57296
Dirk Dougherty [Mon, 18 Jul 2016 15:26:50 +0000 (15:26 +0000)]
Doc change: updated issues in DP5 release notes. am:
73b700404c
am:
3061ceaf82
Change-Id: Ib4be8ed685e72f4eef343958e543e1419ba8ced6
Scott Main [Mon, 18 Jul 2016 15:22:09 +0000 (15:22 +0000)]
Merge \"Merge \\\"update the version number used in docs and update the offline docs landing page\\\" into nyc-dev am:
6623f4177c am:
e8c3590a77\" into nyc-mr1-dev-plus-aosp
am:
9b64190eca
Change-Id: I0653fe8e9bc7e4d5db97bdf6166fb73c451047f9
smain@google.com [Mon, 18 Jul 2016 15:22:05 +0000 (15:22 +0000)]
Merge \\\"update the version number used in docs and update the offline docs landing page\\\" into nyc-dev am:
6623f4177c am:
38b71c5741
am:
5eac2b0d88
Change-Id: I63b57594c6d2eb833a577ff8b51c01e9d2e31d39
Dirk Dougherty [Mon, 18 Jul 2016 15:21:38 +0000 (15:21 +0000)]
Doc change: updated issues in DP5 release notes.
am:
73b700404c
Change-Id: Ia4cf47f5fc268d50cc30d7cfc6c990fb1f5eefec
Dirk Dougherty [Mon, 18 Jul 2016 15:21:11 +0000 (15:21 +0000)]
Doc change: updated issues in DP5 release notes.
am:
73b700404c
Change-Id: Id7bb33217a91f0e37497c83c6e4efbce8743df8b
Android Build Merger (Role) [Mon, 18 Jul 2016 15:16:21 +0000 (15:16 +0000)]
Merge "Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am:
6623f4177c am:
e8c3590a77" into nyc-mr1-dev-plus-aosp
Scott Main [Mon, 18 Jul 2016 15:15:50 +0000 (15:15 +0000)]
Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am:
6623f4177c
am:
e8c3590a77
Change-Id: I69c3100afecb4a545f71bb9a3c28f9580b18ca89
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
Scott Main [Mon, 18 Jul 2016 15:15:14 +0000 (15:15 +0000)]
Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am:
6623f4177c
am:
38b71c5741
Change-Id: Ice045bb360e2de70af6cc3cc721d6ec5f55e8f58
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:24 +0000 (08:09 -0700)]
Doc change: updated issues in DP5 release notes.
Change-Id: I8c5af9a9523be71451a23bbac9b34da5079dbc27
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
smain@google.com [Mon, 18 Jul 2016 15:08:13 +0000 (15:08 +0000)]
Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev
am:
6623f4177c
Change-Id: Iedcaed7bc842c353bbf2dc3f66dfa5054613d1e8
smain@google.com [Mon, 18 Jul 2016 15:07:55 +0000 (15:07 +0000)]
Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev
am:
6623f4177c
Change-Id: I60626863804f787bf5e1435003d730427f1254df
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
Scott Main [Mon, 18 Jul 2016 14:57:37 +0000 (14:57 +0000)]
Merge "update the version number used in docs and update the offline docs landing page" into nyc-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
OSDN Git Service
