OSDN Git Service
Android Build Merger (Role) [Thu, 22 Sep 2016 22:10:17 +0000 (22:10 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 22:09:29 +0000 (22:09 +0000)]
[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
Android Build Merger (Role) [Thu, 22 Sep 2016 22:09:10 +0000 (22:09 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 22:08:40 +0000 (22:08 +0000)]
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
Android Build Merger (Role) [Thu, 22 Sep 2016 22:08:21 +0000 (22:08 +0000)]
Merge "Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev am:
6b87569b4c am:
780da3b704" into nyc-mr1-dev-plus-aosp
Adam Powell [Thu, 22 Sep 2016 22:07:30 +0000 (22:07 +0000)]
Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev am:
6b87569b4c
am:
780da3b704
Change-Id: Ibd691f8027123ba262807faae3696aeeeb91971f
Android Build Merger (Role) [Thu, 22 Sep 2016 22:07:14 +0000 (22:07 +0000)]
Merge "Null check for restoring LoaderManagers am:
100ba76d7a am:
bb2011a2e0" into nyc-mr1-dev-plus-aosp
Adam Powell [Thu, 22 Sep 2016 22:06:38 +0000 (22:06 +0000)]
Null check for restoring LoaderManagers am:
100ba76d7a
am:
bb2011a2e0
Change-Id: I8afc2a6f4808d1b36c1f2651617793854e799d11
Android Build Merger (Role) [Thu, 22 Sep 2016 22:06:15 +0000 (22:06 +0000)]
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
Wale Ogunwale [Thu, 22 Sep 2016 22:05:36 +0000 (22:05 +0000)]
Merge "Save activity state before stopping acitivity when device sleeps" into nyc-mr1-dev am:
8da796d0b8
am:
1197c16ea7
Change-Id: Ic0eab67c6a23a22ac63da2a2a74ac168e9a0b325
Android Build Merger (Role) [Thu, 22 Sep 2016 22:05:20 +0000 (22:05 +0000)]
Merge "Save activity state before stopping acitivity when device sleeps am:
b5066fe307 am:
3adb9d9318" into nyc-mr1-dev-plus-aosp
Wale Ogunwale [Thu, 22 Sep 2016 22:04:36 +0000 (22:04 +0000)]
Save activity state before stopping acitivity when device sleeps am:
b5066fe307
am:
3adb9d9318
Change-Id: Ic18fbf92fe029a0eea3d886450a97c9877db7020
Android Build Merger (Role) [Thu, 22 Sep 2016 22:04:22 +0000 (22:04 +0000)]
Merge "Merge "Immediately deliver new intent to paused activities." into nyc-mr1-dev am:
10bafbd9f9 am:
c2226d8db6" into nyc-mr1-dev-plus-aosp
Wale Ogunwale [Thu, 22 Sep 2016 22:03:27 +0000 (22:03 +0000)]
Merge "Immediately deliver new intent to paused activities." into nyc-mr1-dev am:
10bafbd9f9
am:
c2226d8db6
Change-Id: If3118c26f0616b4f0f977132b6152f47e686448c
Android Build Merger (Role) [Thu, 22 Sep 2016 22:03:10 +0000 (22:03 +0000)]
Merge "Immediately deliver new intent to paused activities. am:
03f7e9e944 am:
08d6689303" into nyc-mr1-dev-plus-aosp
Wale Ogunwale [Thu, 22 Sep 2016 22:02:28 +0000 (22:02 +0000)]
Immediately deliver new intent to paused activities. am:
03f7e9e944
am:
08d6689303
Change-Id: I86bc60c70f373ae2a8df27ac32f27a3b665e1ac3
Android Build Merger (Role) [Thu, 22 Sep 2016 22:02:13 +0000 (22:02 +0000)]
Merge "Merge "Add DevicePolicyManager.setBackupServiceEnabled as hidden API." into nyc-mr1-dev am:
dd6230d466 am:
157b98c134" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 22 Sep 2016 22:00:35 +0000 (22:00 +0000)]
Merge "Merge "Remove net_bt_stack group and replace it with bluetooth" am:
2309b98b25 am:
4a1fd7eb3d am:
bd25fec0d9" into nyc-mr1-dev-plus-aosp
Vladislav Kuzkokov [Thu, 22 Sep 2016 22:00:40 +0000 (22:00 +0000)]
Merge "Add DevicePolicyManager.setBackupServiceEnabled as hidden API." into nyc-mr1-dev am:
dd6230d466
am:
157b98c134
Change-Id: Ibe08611f4ea565da4c9da09a3579eb68d36bd0b8
Vladislav Kuzkokov [Thu, 22 Sep 2016 21:59:49 +0000 (21:59 +0000)]
Add DevicePolicyManager.setBackupServiceEnabled as hidden API. am:
5a122a1ce9
am:
8a48085267
Change-Id: I0dc9c4492dfac2a72fc976a1e5204c2c14ec14c4
Ajay Panicker [Thu, 22 Sep 2016 21:58:14 +0000 (21:58 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth" am:
2309b98b25 am:
4a1fd7eb3d
am:
bd25fec0d9
Change-Id: I3825be4ebe408de183ad2787ca3da0c17d706e0d
Todd Kennedy [Thu, 22 Sep 2016 21:56:54 +0000 (21:56 +0000)]
Merge "Add remote control of Instant Apps" into nyc-mr1-dev am:
03779f227a
am:
56054285f3
Change-Id: I2ca1e98fcf41df1300daac19b06d0bd82dc20ea7
Todd Kennedy [Thu, 22 Sep 2016 21:55:44 +0000 (21:55 +0000)]
Add remote control of Instant Apps am:
d15bb75af6
am:
f308ffc915
Change-Id: If7a6884bb896c1bab38c7d0fe963c06125a44c26
Android Build Merger (Role) [Thu, 22 Sep 2016 20:41:54 +0000 (20:41 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 20:40:59 +0000 (20:40 +0000)]
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
Android Build Merger (Role) [Thu, 22 Sep 2016 20:40:36 +0000 (20:40 +0000)]
Merge "Merge "Revert fixed at links." into nyc-dev am:
c77b72f244 am:
ed870fccb4" into nyc-mr1-dev-plus-aosp
Ajay Panicker [Thu, 22 Sep 2016 20:40:22 +0000 (20:40 +0000)]
[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
Elliot Waite [Thu, 22 Sep 2016 20:39:57 +0000 (20:39 +0000)]
Merge "Revert fixed at links." into nyc-dev am:
c77b72f244
am:
ed870fccb4
Change-Id: Id541747a9bcc1011b2197653b1dde02d84b2cf0f
Android Build Merger (Role) [Thu, 22 Sep 2016 20:39:36 +0000 (20:39 +0000)]
Merge "Revert fixed at links. am:
7c70fed347 am:
ef69678105" into nyc-mr1-dev-plus-aosp
Ajay Panicker [Thu, 22 Sep 2016 20:39:33 +0000 (20:39 +0000)]
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
Elliot Waite [Thu, 22 Sep 2016 20:38:57 +0000 (20:38 +0000)]
Revert fixed at links. am:
7c70fed347
am:
ef69678105
Change-Id: I39e63504cd598497571a6d8dee8abf34ac2441fa
Android Build Merger (Role) [Thu, 22 Sep 2016 20:38:32 +0000 (20:38 +0000)]
Merge "Found a couple of more references to Android N. am:
9af57aa309 am:
4c9ecfbd01" into nyc-mr1-dev-plus-aosp
Adam Powell [Thu, 22 Sep 2016 20:38:03 +0000 (20:38 +0000)]
Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev
am:
6b87569b4c
Change-Id: I3ec24a57b6f4da270926a6b6b2f0f231d6d703f1
Adam Powell [Thu, 22 Sep 2016 20:38:00 +0000 (20:38 +0000)]
Null check for restoring LoaderManagers
am:
100ba76d7a
Change-Id: I7b5eecf24d73fd62abaa2825374bd936f15425e5
Adarsh Fernando [Thu, 22 Sep 2016 20:37:52 +0000 (20:37 +0000)]
Found a couple of more references to Android N. am:
9af57aa309
am:
4c9ecfbd01
Change-Id: I5613c66a25fa9f50a2981d17ef7fad369ea012c8
Android Build Merger (Role) [Thu, 22 Sep 2016 20:37:29 +0000 (20:37 +0000)]
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
Adarsh Fernando [Thu, 22 Sep 2016 20:36:51 +0000 (20:36 +0000)]
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am:
fe060d3f37
am:
df9659a112
Change-Id: If254ebcc7e0636bf95626475495e868b65cc922b
Wale Ogunwale [Thu, 22 Sep 2016 20:36:39 +0000 (20:36 +0000)]
Merge "Save activity state before stopping acitivity when device sleeps" into nyc-mr1-dev
am:
8da796d0b8
Change-Id: Id15c28c138026fdf9c5b596fbea3b20f4e7e72c2
Wale Ogunwale [Thu, 22 Sep 2016 20:36:32 +0000 (20:36 +0000)]
Save activity state before stopping acitivity when device sleeps
am:
b5066fe307
Change-Id: I95e897de48a9f5b10728110b5b3c9d379f86f695
Wale Ogunwale [Thu, 22 Sep 2016 20:35:03 +0000 (20:35 +0000)]
Merge "Immediately deliver new intent to paused activities." into nyc-mr1-dev
am:
10bafbd9f9
Change-Id: I5c51c9749fe14a047a17e2e41ac28de0d8fe7d6c
Wale Ogunwale [Thu, 22 Sep 2016 20:34:59 +0000 (20:34 +0000)]
Immediately deliver new intent to paused activities.
am:
03f7e9e944
Change-Id: I962edc54a173b204a5b24fb3d1871500852d35c2
Ajay Panicker [Thu, 22 Sep 2016 20:33:28 +0000 (20:33 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470 am:
1783182332 am:
993015ce9a am:
8e172c638d -s ours am:
9338ffa148 am:
7e78a89923 am:
8e3293e81f
am:
b412f807af
Change-Id: I5e2d033cedfb65f825a160a478bea44e69f55721
Adarsh Fernando [Thu, 22 Sep 2016 20:07:20 +0000 (20:07 +0000)]
Docs: Cleanup of Preview language in Android 7.0 docs. am:
4b6d939321
am:
ce73af6cd2
Change-Id: I39a613b0469f6725c6bc936b8678327b869b5c5f
Etan Cohen [Thu, 22 Sep 2016 20:04:04 +0000 (20:04 +0000)]
Merge "[NAN] Method renames based on API council feedback" am:
dcac00f325 am:
3501748dea
am:
6b6c719dd2
Change-Id: I5ea3e18bbaec7875b3720febfd4bbdcb97c92883
Vladislav Kuzkokov [Thu, 22 Sep 2016 20:03:43 +0000 (20:03 +0000)]
Merge "Add DevicePolicyManager.setBackupServiceEnabled as hidden API." into nyc-mr1-dev
am:
dd6230d466
Change-Id: I92ab3621a9345a1322eba8cff81009d6baf05cea
Vladislav Kuzkokov [Thu, 22 Sep 2016 20:03:40 +0000 (20:03 +0000)]
Add DevicePolicyManager.setBackupServiceEnabled as hidden API.
am:
5a122a1ce9
Change-Id: I134891f0b24cc666c34ae54cb3c937ba2f16648e
Todd Kennedy [Thu, 22 Sep 2016 20:01:10 +0000 (20:01 +0000)]
Merge "Add remote control of Instant Apps" into nyc-mr1-dev
am:
03779f227a
Change-Id: I5a6339f9398cacc0feedca8dfc5dcac5d46c4b04
Todd Kennedy [Thu, 22 Sep 2016 19:58:11 +0000 (19:58 +0000)]
Add remote control of Instant Apps
am:
d15bb75af6
Change-Id: I0433b101966f65daeb5d1d2ea04cf648572a8e58
Ajay Panicker [Thu, 22 Sep 2016 19:57:44 +0000 (19:57 +0000)]
[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
Change-Id: Id58741db4a95f6cb381531d3b9d9a2a9ce67350e
Ajay Panicker [Thu, 22 Sep 2016 19:56:53 +0000 (19:56 +0000)]
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
Change-Id: I6a22e59059ff3224de00b756684998392124eb5a
Ajay Panicker [Thu, 22 Sep 2016 19:56:43 +0000 (19:56 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470 am:
1783182332 am:
993015ce9a am:
8e172c638d -s ours am:
9338ffa148 am:
7e78a89923
am:
8e3293e81f
Change-Id: I8efb7cd14dacac60f020784c0395c17d32ab6364
TreeHugger Robot [Thu, 22 Sep 2016 19:29:21 +0000 (19:29 +0000)]
Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 19:27:25 +0000 (19:27 +0000)]
Merge "Save activity state before stopping acitivity when device sleeps" into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 19:26:34 +0000 (19:26 +0000)]
Merge "Immediately deliver new intent to paused activities." into nyc-mr1-dev
Wei Liu [Thu, 22 Sep 2016 19:02:16 +0000 (19:02 +0000)]
Merge "Allow shell to acquire wakelock." into cw-f-dev
am:
0712525f13
Change-Id: I1a081a2906acb5456f9dfdb57bcd82c99ecf4b60
Wei Liu [Thu, 22 Sep 2016 19:01:42 +0000 (19:01 +0000)]
Allow shell to acquire wakelock.
am:
6e500010b1
Change-Id: I8331a2a2830551a87953edf040c1ed432e0bfd09
Wei Liu [Thu, 22 Sep 2016 18:37:22 +0000 (18:37 +0000)]
Merge "Allow shell to acquire wakelock." into cw-f-dev
Adam Powell [Thu, 22 Sep 2016 17:47:40 +0000 (10:47 -0700)]
Null check for restoring LoaderManagers
Bug
31671195
Test: core/tests/coretests/src/android/app/LoaderLifecycleTest.java
Change-Id: Ib553f7611814cc6759488aec505fd126ee664a9d
Vladislav Kuzkokov [Thu, 22 Sep 2016 17:09:02 +0000 (17:09 +0000)]
Merge "Add DevicePolicyManager.setBackupServiceEnabled as hidden API." into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 16:57:11 +0000 (16:57 +0000)]
Merge "Add remote control of Instant Apps" into nyc-mr1-dev
Ajay Panicker [Thu, 22 Sep 2016 16:31:34 +0000 (16:31 +0000)]
[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
Change-Id: I3b8c695133c8631e7f058b9fd26da13d69d23735
Ajay Panicker [Thu, 22 Sep 2016 16:30:28 +0000 (16:30 +0000)]
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
Change-Id: I35793a0332aaeb572a288d7806aed2bc43879dab
Jaewan Kim [Thu, 22 Sep 2016 16:28:56 +0000 (16:28 +0000)]
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:
c56cabef9d am:
ca887d4372
am:
f1a89617d2
Change-Id: I7fa92856df8e0e77831b419cc30549811749a4d3
Ajay Panicker [Thu, 22 Sep 2016 16:08:32 +0000 (16:08 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470 am:
1783182332 am:
993015ce9a am:
8e172c638d -s ours am:
9338ffa148
am:
7e78a89923
Change-Id: I3027a2d1f49280a39eff5711413f38e6c48117b6
Wale Ogunwale [Thu, 22 Sep 2016 16:04:09 +0000 (09:04 -0700)]
Immediately deliver new intent to paused activities.
ag/
1437028 tried to fix this problem, but limited intent
delivery to only paused activities in a minimized docked stack
to reduce the effect of the change since we are late in the
release cycle. However, it didn't completely solve the problem
for example when the ChooserActivity comes up in the fullscreen
stack un-minimizing the docked stack and then the user selects
the app in the docked stack from ChooserActivity.
We now immediately deliver intents to paused activities as they
are currently visible to the user and we want the user to see
the visual effects caused by the intent delivery now.
Bug:
31371093
Change-Id: I94f9717da66daa512071bb96e62b2f9811691a78
Jaewan Kim [Thu, 22 Sep 2016 15:45:59 +0000 (15:45 +0000)]
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:
c56cabef9d
am:
ca887d4372
Change-Id: I7beae8457f16b832a1b31a0f78f8fc9c5601a13d
Jaewan Kim [Thu, 22 Sep 2016 14:51:15 +0000 (14:51 +0000)]
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:
091681149b am:
245e33a0b1
am:
69d6c23313
Change-Id: Ib1509bd856c1170541e5641b74b3348211525951
Wale Ogunwale [Wed, 21 Sep 2016 14:33:43 +0000 (07:33 -0700)]
Save activity state before stopping acitivity when device sleeps
Makes it consistent with the regular stop code path and allows
for the activity to be relaunched with the right state if a
relaunch happens after stop due to sleep.
Bug:
30241363
Change-Id: I92edfe6e0e3f5c7ce3b56d49df31e601a798cd4f
Ajay Panicker [Thu, 22 Sep 2016 14:24:38 +0000 (14:24 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470 am:
1783182332 am:
993015ce9a am:
8e172c638d -s ours
am:
9338ffa148
Change-Id: I92ec98b22ea071df0a24d19f8a6bb4523606089d
Jaewan Kim [Thu, 22 Sep 2016 14:24:35 +0000 (14:24 +0000)]
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:
c56cabef9d
Change-Id: I8b96206d95e5da72027a62251c910903230946d9
Jaewan Kim [Thu, 22 Sep 2016 14:24:21 +0000 (14:24 +0000)]
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:
091681149b
am:
245e33a0b1
Change-Id: I924d239c9536c60449e3de101c387ee06c45be4b
Jaewan Kim [Thu, 22 Sep 2016 13:57:14 +0000 (13:57 +0000)]
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
Change-Id: Ife5fa9fb43fb28eb8e71a7707c846c58d18478b4
Bill Yi [Thu, 22 Sep 2016 13:35:10 +0000 (13:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am:
994ec6a0ec -s ours am:
b1056852a5 -s ours
am:
d343a87b10 -s ours
Change-Id: Ibce5ef78caea52616175afac35d0fdd828de2265
Bill Yi [Thu, 22 Sep 2016 13:34:01 +0000 (13:34 +0000)]
Import translations. DO NOT MERGE am:
a6c51e2c94 -s ours am:
563510e1b6 -s ours
am:
96853eb87d -s ours
Change-Id: I33f98d53a50bc42203d10039ccc075a762b474f1
Bill Yi [Thu, 22 Sep 2016 13:33:10 +0000 (13:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
6856972e4b -s ours
am:
4fb97691f1 -s ours
Change-Id: Id1b8769304a7ceb182364c562156cf64cc92f2eb
Bill Yi [Thu, 22 Sep 2016 13:10:34 +0000 (13:10 +0000)]
Import translations. DO NOT MERGE am:
7060296d02 -s ours
am:
3dc3d3eda4 -s ours
Change-Id: I355d68d5f7889543e4a51c633b7b06a5aa0192dc
Bill Yi [Thu, 22 Sep 2016 12:35:01 +0000 (12:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
d5d5dc2473 -s ours
am:
7640ef24d1 -s ours
Change-Id: I6d733530f0fb6ab39ae4819e40cd5d5fbd47ff8e
Bill Yi [Thu, 22 Sep 2016 12:34:06 +0000 (12:34 +0000)]
Import translations. DO NOT MERGE am:
6394011a86 -s ours
am:
660e6d0269 -s ours
Change-Id: Idffe63458f7f0235e9ede96ab27fe4f61f30437b
Bill Yi [Thu, 22 Sep 2016 12:32:35 +0000 (12:32 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
5086fe2800 -s ours
Change-Id: I891dc2d4f99ac46f225837b9a71013ad8ff142c7
Bill Yi [Thu, 22 Sep 2016 12:32:27 +0000 (12:32 +0000)]
Import translations. DO NOT MERGE
am:
7fea90bfec -s ours
Change-Id: I312c228c256b9f71174e6c02af8a7c1dfceaae97
Bill Yi [Thu, 22 Sep 2016 12:32:04 +0000 (12:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am:
994ec6a0ec -s ours
am:
b1056852a5 -s ours
Change-Id: I01089f7bf4258e4e894f2a2d996b6750e17c5e7b
Bill Yi [Thu, 22 Sep 2016 12:31:07 +0000 (12:31 +0000)]
Import translations. DO NOT MERGE am:
a6c51e2c94 -s ours
am:
563510e1b6 -s ours
Change-Id: I8b1d1b7af93df4253166aef4338b7f07759d9f19
Bill Yi [Thu, 22 Sep 2016 12:30:03 +0000 (12:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
c051914a46 -s ours
Change-Id: Id2bfbe894e47451efc8159a8cd692537d4f291f5
Bill Yi [Thu, 22 Sep 2016 12:29:57 +0000 (12:29 +0000)]
Import translations. DO NOT MERGE
am:
e0e30f5320 -s ours
Change-Id: If1a43ad1feb011755cf61f6c38a37b6c37ce56c8
Bill Yi [Thu, 22 Sep 2016 12:29:55 +0000 (12:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
6856972e4b -s ours
Change-Id: I0071654ea2d70605ea858e19454621f97fd92f28
Bill Yi [Thu, 22 Sep 2016 12:29:51 +0000 (12:29 +0000)]
Import translations. DO NOT MERGE
am:
7060296d02 -s ours
Change-Id: Iece9d5abf1ddb194f6009640ad6626609a8d769e
Jaewan Kim [Thu, 22 Sep 2016 12:26:49 +0000 (12:26 +0000)]
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:
091681149b
Change-Id: I0fb73df3b32342897159f99b8f1ee99b975f8874
Ajay Panicker [Thu, 22 Sep 2016 11:23:35 +0000 (11:23 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth" am:
2309b98b25
am:
4a1fd7eb3d
Change-Id: If1fc5aab977c74c0865e0abc18205eaf028148c7
Ajay Panicker [Thu, 22 Sep 2016 10:55:43 +0000 (10:55 +0000)]
[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
Change-Id: I21edab5680d1cc4f5afa74ab9764f0ff945a44cc
Ajay Panicker [Thu, 22 Sep 2016 10:54:53 +0000 (10:54 +0000)]
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
Change-Id: Iedd8920de15034413968efa125fa544b5a25e87c
Ajay Panicker [Thu, 22 Sep 2016 10:53:39 +0000 (10:53 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470 am:
1783182332 am:
993015ce9a
am:
8e172c638d -s ours
Change-Id: I6ed9ac6f79a853f08fbc3105cade0d47033701f0
Jaewan Kim [Thu, 22 Sep 2016 10:52:37 +0000 (10:52 +0000)]
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
Change-Id: I79036440c10f32b4a30fbefa3a3ff65ebd9fc69e
Jaewan Kim [Thu, 22 Sep 2016 10:50:05 +0000 (10:50 +0000)]
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
Change-Id: Iede8b78ecc2ae054266286d69317b655263deacc
Elliot Waite [Thu, 22 Sep 2016 10:32:13 +0000 (10:32 +0000)]
Merge "Revert fixed at links." into nyc-dev am:
c77b72f244 am:
8ea167bf7a am:
ffb31e9954
am:
99e8284514
Change-Id: I3cafba5a53c0a94b0569bbed1652f1fa61e69c88
Elliot Waite [Thu, 22 Sep 2016 10:31:18 +0000 (10:31 +0000)]
Revert fixed at links. am:
7c70fed347 am:
4a60ffd518 am:
e2b498241a
am:
47b11423ac
Change-Id: Ibae53d75c5f9ad8e0ee3e69688fbbe74448cdc22
Adarsh Fernando [Thu, 22 Sep 2016 10:30:08 +0000 (10:30 +0000)]
Found a couple of more references to Android N. am:
9af57aa309 am:
9a91d6662e am:
acb068a213
am:
9fc1b4c5b8
Change-Id: I0704581c446b52a1a75cea63e9e6b4a191d554e7
Adarsh Fernando [Thu, 22 Sep 2016 10:29:18 +0000 (10:29 +0000)]
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am:
fe060d3f37 am:
453160c39d am:
551d5d7f7f
am:
a7de0e1f58
Change-Id: Ied8793e814a3eaf31da62ba78f18c339347a0b45
Adarsh Fernando [Thu, 22 Sep 2016 10:28:18 +0000 (10:28 +0000)]
Docs: Cleanup of Preview language in Android 7.0 docs. am:
4b6d939321 am:
0b8e646225 am:
059c09784d
am:
4fb36b0dfb
Change-Id: I1d65d529a99f23b01c1ec1533cddc800d3647d75
Stuart Scott [Thu, 22 Sep 2016 10:27:00 +0000 (10:27 +0000)]
Merge "Continue if package is not in system" into nyc-dr1-dev am:
cffe1f48d3 am:
a676b157fb
am:
a177302cd0
Change-Id: I4ee26f9df77081d8d0ac989810b818775660cf62
Stuart Scott [Thu, 22 Sep 2016 10:26:02 +0000 (10:26 +0000)]
Continue if package is not in system am:
434c8db80f am:
0845b025aa
am:
b15c45a037
Change-Id: I8426be2a7217eb6eaf78f3e37fd787c065027411
OSDN Git Service
