OSDN Git Service
Jaewan Kim [Thu, 22 Sep 2016 21:55:55 +0000 (21:55 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 20:43:33 +0000 (20:43 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 20:42:30 +0000 (20:42 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 20:41:10 +0000 (20:41 +0000)]
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
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
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
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
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
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
Jaewan Kim [Thu, 22 Sep 2016 20:02:03 +0000 (20:02 +0000)]
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
Change-Id: I9d22f3dd260464e2aa82e33c7b0764c5bfae9a4e
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
Jaewan Kim [Thu, 22 Sep 2016 20:01:06 +0000 (20:01 +0000)]
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
Change-Id: I06e443fa305dea4f8465158eeca19931d89cfd71
Jaewan Kim [Thu, 22 Sep 2016 20:00:10 +0000 (20:00 +0000)]
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
Change-Id: I4389cf598e8aa4789717439da450c7de3e9e37dc
Ajay Panicker [Thu, 22 Sep 2016 19:58:43 +0000 (19:58 +0000)]
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
Change-Id: I2cf340eb0f26edadc1edb6bcdf052c45082e3794
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 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
Jaewan Kim [Thu, 22 Sep 2016 16:35:42 +0000 (16:35 +0000)]
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
Change-Id: If9781b819c9baa55597daaf2ed03b2886739f56e
Jaewan Kim [Thu, 22 Sep 2016 16:34:39 +0000 (16:34 +0000)]
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
Change-Id: I9159be101773b421df3b23ec02d0f7ec8cb64b4a
Jaewan Kim [Thu, 22 Sep 2016 16:33:47 +0000 (16:33 +0000)]
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
Change-Id: I1eb3eba4342a7af62ebbc3a9f4e90e58b5adcac2
Ajay Panicker [Thu, 22 Sep 2016 16:32:31 +0000 (16:32 +0000)]
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
Change-Id: Ib205c5e83f800dbb2a41b812fc0840f2b4029874
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
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
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 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: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
Jaewan Kim [Thu, 22 Sep 2016 10:59:39 +0000 (10:59 +0000)]
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
Change-Id: I68e31867b8c925717eda87a426add614f731f77a
Jaewan Kim [Thu, 22 Sep 2016 10:58:44 +0000 (10:58 +0000)]
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
Change-Id: Idda087e0cbccf3e94dd23a41156cdcc14a4b2459
Jaewan Kim [Thu, 22 Sep 2016 10:57:53 +0000 (10:57 +0000)]
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
Change-Id: I99f14369c3f5f4388a17b85720a45bde8ee4c5be
Ajay Panicker [Thu, 22 Sep 2016 10:56:50 +0000 (10:56 +0000)]
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
Change-Id: Iaae899eeea3c9c95ebcd7654e6fb5a89d7f1ed90
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
Bill Yi [Thu, 22 Sep 2016 10:23:07 +0000 (10:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
am:
994ec6a0ec -s ours
Change-Id: Ida7cf9408ad94d3a17fc7b1154f0644c1ae33442
Bill Yi [Thu, 22 Sep 2016 10:23:04 +0000 (10:23 +0000)]
Import translations. DO NOT MERGE
am:
a6c51e2c94 -s ours
Change-Id: I4e82725c53421b83579b8f3ced716366eaa8df51
Bill Yi [Thu, 22 Sep 2016 10:22:21 +0000 (10:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
d5d5dc2473 -s ours
Change-Id: Ie1fd61e17f3ed2a1429412722f1571e5c1e91954
Bill Yi [Thu, 22 Sep 2016 10:22:17 +0000 (10:22 +0000)]
Import translations. DO NOT MERGE
am:
6394011a86 -s ours
Change-Id: I5b6ba4829095eed2641781e45468a1f7a009ec85
TreeHugger Robot [Thu, 22 Sep 2016 09:56:52 +0000 (09:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 22 Sep 2016 09:56:31 +0000 (09:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 22 Sep 2016 09:54:10 +0000 (09:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 09:53:00 +0000 (09:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 09:51:57 +0000 (09:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Jaewan Kim [Thu, 22 Sep 2016 09:38:13 +0000 (09:38 +0000)]
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
Change-Id: I373b66ee022f14d331729531c450eb18f8572d9b
Jaewan Kim [Thu, 22 Sep 2016 09:14:33 +0000 (09:14 +0000)]
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
Change-Id: I57e8a4e6b415683cba317afa012880b8ac12bff6
Elliot Waite [Thu, 22 Sep 2016 09:14:10 +0000 (09:14 +0000)]
Merge "Revert fixed at links." into nyc-dev am:
c77b72f244 am:
8ea167bf7a
am:
ffb31e9954
Change-Id: I6e4932469886f810162460c5de855c46d2f2fb2b
Jaewan Kim [Thu, 22 Sep 2016 09:13:26 +0000 (09:13 +0000)]
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
Change-Id: I6a216c2e2ddb6b9959e9691c5014c0d29b6c453d
Elliot Waite [Thu, 22 Sep 2016 09:13:23 +0000 (09:13 +0000)]
Revert fixed at links. am:
7c70fed347 am:
4a60ffd518
am:
e2b498241a
Change-Id: I0f40cd7bdc31dcf0f3865f3ff70a9e8012aedfbc
Jaewan Kim [Thu, 22 Sep 2016 09:13:16 +0000 (09:13 +0000)]
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
Change-Id: I9d7b96411a566e6fa4ad4c8d263140245b427b44
Adarsh Fernando [Thu, 22 Sep 2016 09:12:28 +0000 (09:12 +0000)]
Found a couple of more references to Android N. am:
9af57aa309 am:
9a91d6662e
am:
acb068a213
Change-Id: I008c015bfb6c934edb55a6ece40ba3237945f66b
Jaewan Kim [Thu, 22 Sep 2016 08:45:03 +0000 (08:45 +0000)]
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
Change-Id: Id6f3783a23706efaa7f389deb84e69c69fab501a
Jaewan Kim [Thu, 22 Sep 2016 08:08:16 +0000 (08:08 +0000)]
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
Change-Id: I1af888ef60ff3920e1b63a421e432319bdefdb3e
Jaewan Kim [Thu, 22 Sep 2016 08:07:35 +0000 (08:07 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
c282c4f106 am:
868d586c98 am:
ff1c1993b7
am:
35e95d82d7 -s ours
Change-Id: I5fe98000c623199706bd3879a361ef72e0da2ccb
Jaewan Kim [Thu, 22 Sep 2016 08:07:15 +0000 (08:07 +0000)]
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
Change-Id: I198e4b87bed7f0b4e253e86a89fa5c36fec1fbb2
Adarsh Fernando [Thu, 22 Sep 2016 08:05:56 +0000 (08:05 +0000)]
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am:
fe060d3f37 am:
453160c39d
am:
551d5d7f7f
Change-Id: I1b4ae3746ec944b013cafb4635d023016d656ce3
Jaewan Kim [Thu, 22 Sep 2016 08:05:11 +0000 (08:05 +0000)]
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
Change-Id: I69062cb6535df22a743270a62fda89dcca155e87
Adarsh Fernando [Thu, 22 Sep 2016 08:04:57 +0000 (08:04 +0000)]
Docs: Cleanup of Preview language in Android 7.0 docs. am:
4b6d939321 am:
0b8e646225
am:
059c09784d
Change-Id: Ice0f6182bf2db6c8d62fc592f65834d4d9adb794
Stuart Scott [Thu, 22 Sep 2016 08:03:52 +0000 (08:03 +0000)]
Merge "Continue if package is not in system" into nyc-dr1-dev am:
cffe1f48d3
am:
a676b157fb
Change-Id: Ib06a5e2be884bac724b3d29d327acd8b0533978a
Stuart Scott [Thu, 22 Sep 2016 08:03:03 +0000 (08:03 +0000)]
Continue if package is not in system am:
434c8db80f
am:
0845b025aa
Change-Id: Id87f7ab2c549d176d82fbcf18479671320a74616
Jaewan Kim [Thu, 22 Sep 2016 08:02:10 +0000 (08:02 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev am:
8ba2549592 am:
60d2af330b
am:
345d75bf88
Change-Id: I38af1702ae0d2766ef15192eb53b35d88849bbf1
Jaewan Kim [Thu, 22 Sep 2016 08:01:22 +0000 (08:01 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
09c3df004b am:
01796f794d
am:
e13dc68953
Change-Id: I525e467ab112abfcd8bf9ef3e6cdc6b4b3f2f78f
Ajay Panicker [Thu, 22 Sep 2016 07:39:22 +0000 (07:39 +0000)]
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
Change-Id: I812cd00912fad74e9f07a6881bec4b93e6e71490
Ajay Panicker [Thu, 22 Sep 2016 07:38:34 +0000 (07:38 +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
Change-Id: Iec857815b52d8b0bdfdd1b14210fa67bc3a17c83
Ajay Panicker [Thu, 22 Sep 2016 07:37:44 +0000 (07:37 +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
Change-Id: I0fbfd3aac6e4d6e6090bfcde65abc8f5641cfe5e
Ajay Panicker [Thu, 22 Sep 2016 07:36:50 +0000 (07:36 +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
Change-Id: I19514d41db780f41114fe05e86360beeda44352b
Jaewan Kim [Thu, 22 Sep 2016 07:35:45 +0000 (07:35 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13 am:
78fa55e261
am:
b2403f3102
Change-Id: Ia418a5eb08b7f5cdb2a987c4f17708069012c0e5
Jaewan Kim [Thu, 22 Sep 2016 07:34:55 +0000 (07:34 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
c282c4f106 am:
868d586c98
am:
ff1c1993b7
Change-Id: I60355987ea0814314c2f79041d068e099b158c7b
Elliot Waite [Thu, 22 Sep 2016 06:46:29 +0000 (06:46 +0000)]
Merge "Revert fixed at links." into nyc-dev am:
c77b72f244
am:
8ea167bf7a
Change-Id: I340bb9df7c736f1c4f22c53cf8919d36f024c32e
Elliot Waite [Thu, 22 Sep 2016 06:45:29 +0000 (06:45 +0000)]
Revert fixed at links. am:
7c70fed347
am:
4a60ffd518
Change-Id: I24d872329e40cea924da713ec3c4f869ab012824
Adarsh Fernando [Thu, 22 Sep 2016 06:44:43 +0000 (06:44 +0000)]
Found a couple of more references to Android N. am:
9af57aa309
am:
9a91d6662e
Change-Id: I82ea73e071445ca4d07602fa54ba1f03f57635b3
Adarsh Fernando [Thu, 22 Sep 2016 06:43:57 +0000 (06:43 +0000)]
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am:
fe060d3f37
am:
453160c39d
Change-Id: I5ca41ea38bfc46ed81d9319f7ce20da7e6399e0d
Adarsh Fernando [Thu, 22 Sep 2016 06:43:14 +0000 (06:43 +0000)]
Docs: Cleanup of Preview language in Android 7.0 docs. am:
4b6d939321
am:
0b8e646225
Change-Id: If303eafb66a971de300758af21a5a830084d0aff
Stuart Scott [Thu, 22 Sep 2016 06:41:55 +0000 (06:41 +0000)]
Merge "Continue if package is not in system" into nyc-dr1-dev
am:
cffe1f48d3
Change-Id: I490c87e5e70059406d3088b3ab8537bd6e42b38c
Stuart Scott [Thu, 22 Sep 2016 06:41:52 +0000 (06:41 +0000)]
Continue if package is not in system
am:
434c8db80f
Change-Id: Ie2a9741583bb09ddcb27e28e18f29d63f371c8ff
Jaewan Kim [Thu, 22 Sep 2016 06:41:02 +0000 (06:41 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev am:
8ba2549592
am:
60d2af330b
Change-Id: I1a234ee41fc85cbe954990d13b5de123efe9afc8
Jaewan Kim [Thu, 22 Sep 2016 06:40:10 +0000 (06:40 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
09c3df004b
am:
01796f794d
Change-Id: Ifdeb43d20983d31713defaae3d7e0075a11cb562
OSDN Git Service
