Android Build Merger (Role)
|
4015995d47
|
Merge "DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1 -s ours am: 8d14f464b5 am: f595add2ff am: e1e6f0a7f5 am: 9632afe809 -s ours am: b96d410537 am: 9b790e27b7 am: 8d45b4522d am: a7dd993294" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:26:43 +00:00 |
|
Jaewan Kim
|
f7338ac8c2
|
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am: 22c9458a13 am: 78fa55e261 am: b2403f3102 am: 5decf8e715 -s ours am: 963c269ffa
am: c17a43fcfd
Change-Id: I61a04498f86546eb6a9e50fad78266ec3bff204f
|
2016-09-22 22:26:04 +00:00 |
|
Jaewan Kim
|
2eea4a662b
|
DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1 -s ours am: 8d14f464b5 am: f595add2ff am: e1e6f0a7f5 am: 9632afe809 -s ours am: b96d410537 am: 9b790e27b7 am: 8d45b4522d
am: a7dd993294
Change-Id: Id9ad8bd6bd849d58a69b7430dcda1efe87255fbc
|
2016-09-22 22:25:57 +00:00 |
|
Android Build Merger (Role)
|
00a3d1d7a1
|
Merge "Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c am: e47b5adce2 am: bea0b3ec06 -s ours am: 91ccfa1def am: 4167620d33 am: 2c9ad0ff81 am: b6d6519e34 -s ours am: 61fda61d20 am: 83ded12e86 am: 3e2f3c2e31 am: 3babfefdb4" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:14:57 +00:00 |
|
Jaewan Kim
|
9120c27419
|
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c am: e47b5adce2 am: bea0b3ec06 -s ours am: 91ccfa1def am: 4167620d33 am: 2c9ad0ff81 am: b6d6519e34 -s ours am: 61fda61d20 am: 83ded12e86 am: 3e2f3c2e31
am: 3babfefdb4
Change-Id: Ie28f23a7d4e711a48f1d654e292019d686c06b2a
|
2016-09-22 22:13:02 +00:00 |
|
Android Build Merger (Role)
|
29c25c03f8
|
Merge "DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c -s ours am: 30d1440861 am: ba1d8300be am: 016d110993 am: 1adff2ee05 -s ours am: 78efad6418 am: 53adfd6294 am: 5886b4ca7b am: fdad028484" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:12:47 +00:00 |
|
Jaewan Kim
|
80843a1b1f
|
DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c -s ours am: 30d1440861 am: ba1d8300be am: 016d110993 am: 1adff2ee05 -s ours am: 78efad6418 am: 53adfd6294 am: 5886b4ca7b
am: fdad028484
Change-Id: Ie9d1f19f2aa1a29d245e3d592aeeb7a868f31ab8
|
2016-09-22 22:12:03 +00:00 |
|
Android Build Merger (Role)
|
2075d8d336
|
Merge "Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d -s ours am: 7cd1668893 am: a5e128ba97 am: 94c08c2bed -s ours am: d4fe288933 am: f65661939b am: 630d577349 am: c9830d56e5 -s ours am: c5442c263a am: b809b1f8aa am: 0471ffa55c am: 0487464b69" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:11:47 +00:00 |
|
Ajay Panicker
|
de55c4699d
|
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d -s ours am: 7cd1668893 am: a5e128ba97 am: 94c08c2bed -s ours am: d4fe288933 am: f65661939b am: 630d577349 am: c9830d56e5 -s ours am: c5442c263a am: b809b1f8aa am: 0471ffa55c
am: 0487464b69
Change-Id: I9e6db05f433329af45f21241216c753d6ac212a3
|
2016-09-22 22:10:38 +00:00 |
|
Android Build Merger (Role)
|
5b396853fb
|
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157 -s ours am: 1448a693d8 am: 3d4c737736 am: f6d8037708 am: 90eafb5322 -s ours am: b2a1dcb913 am: 6ffdf43ec3 am: 5fc21fdbcc am: b2e88d0cb9" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:10:20 +00:00 |
|
Ajay Panicker
|
5d5815dc29
|
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157 -s ours am: 1448a693d8 am: 3d4c737736 am: f6d8037708 am: 90eafb5322 -s ours am: b2a1dcb913 am: 6ffdf43ec3 am: 5fc21fdbcc
am: b2e88d0cb9
Change-Id: Ib3de4e5ef9dd47e7b4bd070b7dfabd295e34e9ec
|
2016-09-22 22:09:29 +00:00 |
|
Android Build Merger (Role)
|
f8033cb4f9
|
Merge "Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b am: 852e5a43b9 -s ours am: a70fffe8e7 am: d677e8d413 am: 73607db5a1 am: 05cd9942d9 -s ours am: 745254f98b am: d91f2f4d2b am: c20376b2a0 am: 4a1b8d7aba" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:09:13 +00:00 |
|
Ajay Panicker
|
108d1eedb2
|
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b am: 852e5a43b9 -s ours am: a70fffe8e7 am: d677e8d413 am: 73607db5a1 am: 05cd9942d9 -s ours am: 745254f98b am: d91f2f4d2b am: c20376b2a0
am: 4a1b8d7aba
Change-Id: I5fa0202b264c224a155b89167cf7a1e3928854c6
|
2016-09-22 22:08:40 +00:00 |
|
Android Build Merger (Role)
|
9e616e1db1
|
Merge "Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev am: 6b87569b4c am: 780da3b704" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:08:24 +00:00 |
|
Adam Powell
|
6b5f966c2f
|
Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev am: 6b87569b4c
am: 780da3b704
Change-Id: Ibd691f8027123ba262807faae3696aeeeb91971f
|
2016-09-22 22:07:30 +00:00 |
|
Android Build Merger (Role)
|
825c6e0dde
|
Merge "Null check for restoring LoaderManagers am: 100ba76d7a am: bb2011a2e0" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:07:17 +00:00 |
|
Adam Powell
|
22766c9a14
|
Null check for restoring LoaderManagers am: 100ba76d7a
am: bb2011a2e0
Change-Id: I8afc2a6f4808d1b36c1f2651617793854e799d11
|
2016-09-22 22:06:38 +00:00 |
|
Android Build Merger (Role)
|
73713dad37
|
Merge "Merge "Save activity state before stopping acitivity when device sleeps" into nyc-mr1-dev am: 8da796d0b8 am: 1197c16ea7" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:06:21 +00:00 |
|
Wale Ogunwale
|
c3fcd4630e
|
Merge "Save activity state before stopping acitivity when device sleeps" into nyc-mr1-dev am: 8da796d0b8
am: 1197c16ea7
Change-Id: Ic0eab67c6a23a22ac63da2a2a74ac168e9a0b325
|
2016-09-22 22:05:36 +00:00 |
|
Android Build Merger (Role)
|
30ed89dbca
|
Merge "Save activity state before stopping acitivity when device sleeps am: b5066fe307 am: 3adb9d9318" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:05:22 +00:00 |
|
Wale Ogunwale
|
0f82e46fb6
|
Save activity state before stopping acitivity when device sleeps am: b5066fe307
am: 3adb9d9318
Change-Id: Ic18fbf92fe029a0eea3d886450a97c9877db7020
|
2016-09-22 22:04:36 +00:00 |
|
Android Build Merger (Role)
|
d92381cc1e
|
Merge "Merge "Immediately deliver new intent to paused activities." into nyc-mr1-dev am: 10bafbd9f9 am: c2226d8db6" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:04:24 +00:00 |
|
Wale Ogunwale
|
772f779fca
|
Merge "Immediately deliver new intent to paused activities." into nyc-mr1-dev am: 10bafbd9f9
am: c2226d8db6
Change-Id: If3118c26f0616b4f0f977132b6152f47e686448c
|
2016-09-22 22:03:27 +00:00 |
|
Android Build Merger (Role)
|
c8ceb557fd
|
Merge "Immediately deliver new intent to paused activities. am: 03f7e9e944 am: 08d6689303" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:03:13 +00:00 |
|
Wale Ogunwale
|
2865b04701
|
Immediately deliver new intent to paused activities. am: 03f7e9e944
am: 08d6689303
Change-Id: I86bc60c70f373ae2a8df27ac32f27a3b665e1ac3
|
2016-09-22 22:02:28 +00:00 |
|
Android Build Merger (Role)
|
2c686e8655
|
Merge "Merge "Add DevicePolicyManager.setBackupServiceEnabled as hidden API." into nyc-mr1-dev am: dd6230d466 am: 157b98c134" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:02:15 +00:00 |
|
Android Build Merger (Role)
|
fcc658d56b
|
Merge "Merge "Remove net_bt_stack group and replace it with bluetooth" am: 2309b98b25 am: 4a1fd7eb3d am: bd25fec0d9" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:00:42 +00:00 |
|
Vladislav Kuzkokov
|
ec9c02133c
|
Merge "Add DevicePolicyManager.setBackupServiceEnabled as hidden API." into nyc-mr1-dev am: dd6230d466
am: 157b98c134
Change-Id: Ibe08611f4ea565da4c9da09a3579eb68d36bd0b8
|
2016-09-22 22:00:40 +00:00 |
|
Vladislav Kuzkokov
|
5d25d52900
|
Add DevicePolicyManager.setBackupServiceEnabled as hidden API. am: 5a122a1ce9
am: 8a48085267
Change-Id: I0dc9c4492dfac2a72fc976a1e5204c2c14ec14c4
|
2016-09-22 21:59:49 +00:00 |
|
Ajay Panicker
|
92b85c47ac
|
Merge "Remove net_bt_stack group and replace it with bluetooth" am: 2309b98b25 am: 4a1fd7eb3d
am: bd25fec0d9
Change-Id: I3825be4ebe408de183ad2787ca3da0c17d706e0d
|
2016-09-22 21:58:14 +00:00 |
|
Todd Kennedy
|
31d867d092
|
Merge "Add remote control of Instant Apps" into nyc-mr1-dev am: 03779f227a
am: 56054285f3
Change-Id: I2ca1e98fcf41df1300daac19b06d0bd82dc20ea7
|
2016-09-22 21:56:54 +00:00 |
|
Jaewan Kim
|
a7dd993294
|
DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1 -s ours am: 8d14f464b5 am: f595add2ff am: e1e6f0a7f5 am: 9632afe809 -s ours am: b96d410537 am: 9b790e27b7
am: 8d45b4522d
Change-Id: I8614621c0e2800749d0186c4b2170c7310eff5a6
|
2016-09-22 21:55:55 +00:00 |
|
Todd Kennedy
|
6f38e68456
|
Add remote control of Instant Apps am: d15bb75af6
am: f308ffc915
Change-Id: If7a6884bb896c1bab38c7d0fe963c06125a44c26
|
2016-09-22 21:55:44 +00:00 |
|
Jaewan Kim
|
3babfefdb4
|
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c am: e47b5adce2 am: bea0b3ec06 -s ours am: 91ccfa1def am: 4167620d33 am: 2c9ad0ff81 am: b6d6519e34 -s ours am: 61fda61d20 am: 83ded12e86
am: 3e2f3c2e31
Change-Id: I75a62471c3c975b6af6cf5364fa59beda442e9df
|
2016-09-22 20:43:33 +00:00 |
|
Jaewan Kim
|
fdad028484
|
DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c -s ours am: 30d1440861 am: ba1d8300be am: 016d110993 am: 1adff2ee05 -s ours am: 78efad6418 am: 53adfd6294
am: 5886b4ca7b
Change-Id: I45a85477c89ca2f291f29b99864baff1d2afc29b
|
2016-09-22 20:42:30 +00:00 |
|
Android Build Merger (Role)
|
b380c545d2
|
Merge "DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106 am: 868d586c98 am: ff1c1993b7 am: 35e95d82d7 -s ours am: 2ccdbce954 am: aff8ee6351" into nyc-mr1-dev-plus-aosp
|
2016-09-22 20:41:56 +00:00 |
|
Ajay Panicker
|
0487464b69
|
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d -s ours am: 7cd1668893 am: a5e128ba97 am: 94c08c2bed -s ours am: d4fe288933 am: f65661939b am: 630d577349 am: c9830d56e5 -s ours am: c5442c263a am: b809b1f8aa
am: 0471ffa55c
Change-Id: Ifcce2c9d4c19c5fd3e4dd11cd55f8b379972bc72
|
2016-09-22 20:41:10 +00:00 |
|
Jaewan Kim
|
aa3262bde4
|
DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106 am: 868d586c98 am: ff1c1993b7 am: 35e95d82d7 -s ours am: 2ccdbce954
am: aff8ee6351
Change-Id: I6e5f890d16517bb9bea3e8c03fc1f364b1a10849
|
2016-09-22 20:40:59 +00:00 |
|
Android Build Merger (Role)
|
04f7418362
|
Merge "Merge "Revert fixed at links." into nyc-dev am: c77b72f244 am: ed870fccb4" into nyc-mr1-dev-plus-aosp
|
2016-09-22 20:40:39 +00:00 |
|
Ajay Panicker
|
b2e88d0cb9
|
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157 -s ours am: 1448a693d8 am: 3d4c737736 am: f6d8037708 am: 90eafb5322 -s ours am: b2a1dcb913 am: 6ffdf43ec3
am: 5fc21fdbcc
Change-Id: Id840dfd2c1a424173932ac6c1ddf0c722bbf98fa
|
2016-09-22 20:40:22 +00:00 |
|
Elliot Waite
|
60748cb208
|
Merge "Revert fixed at links." into nyc-dev am: c77b72f244
am: ed870fccb4
Change-Id: Id541747a9bcc1011b2197653b1dde02d84b2cf0f
|
2016-09-22 20:39:57 +00:00 |
|
Android Build Merger (Role)
|
c036bb1261
|
Merge "Revert fixed at links. am: 7c70fed347 am: ef69678105" into nyc-mr1-dev-plus-aosp
|
2016-09-22 20:39:39 +00:00 |
|
Ajay Panicker
|
4a1b8d7aba
|
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b am: 852e5a43b9 -s ours am: a70fffe8e7 am: d677e8d413 am: 73607db5a1 am: 05cd9942d9 -s ours am: 745254f98b am: d91f2f4d2b
am: c20376b2a0
Change-Id: I2e260246a45043ec46f9ffec2eb4147d310c7dc3
|
2016-09-22 20:39:33 +00:00 |
|
Elliot Waite
|
4ae458ffdc
|
Revert fixed at links. am: 7c70fed347
am: ef69678105
Change-Id: I39e63504cd598497571a6d8dee8abf34ac2441fa
|
2016-09-22 20:38:57 +00:00 |
|
Android Build Merger (Role)
|
29f2030001
|
Merge "Found a couple of more references to Android N. am: 9af57aa309 am: 4c9ecfbd01" into nyc-mr1-dev-plus-aosp
|
2016-09-22 20:38:34 +00:00 |
|
Adam Powell
|
780da3b704
|
Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev
am: 6b87569b4c
Change-Id: I3ec24a57b6f4da270926a6b6b2f0f231d6d703f1
|
2016-09-22 20:38:03 +00:00 |
|
Adam Powell
|
bb2011a2e0
|
Null check for restoring LoaderManagers
am: 100ba76d7a
Change-Id: I7b5eecf24d73fd62abaa2825374bd936f15425e5
|
2016-09-22 20:38:00 +00:00 |
|
Adarsh Fernando
|
b44c904cef
|
Found a couple of more references to Android N. am: 9af57aa309
am: 4c9ecfbd01
Change-Id: I5613c66a25fa9f50a2981d17ef7fad369ea012c8
|
2016-09-22 20:37:52 +00:00 |
|
Android Build Merger (Role)
|
97f67891e1
|
Merge "Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am: fe060d3f37 am: df9659a112" into nyc-mr1-dev-plus-aosp
|
2016-09-22 20:37:32 +00:00 |
|
Adarsh Fernando
|
043946c385
|
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am: fe060d3f37
am: df9659a112
Change-Id: If254ebcc7e0636bf95626475495e868b65cc922b
|
2016-09-22 20:36:51 +00:00 |
|