Jeff Sharkey
|
77d25d4bd5
|
Merge "Recursively restorecon when SELinux label changes." into nyc-mr1-dev am: 8423493a85
am: 12de26b83b
Change-Id: I0feaa2cb9686b869a0fbb3c44a37ef5ee108b0c2
|
2016-09-22 23:33:22 +00:00 |
|
Jeff Sharkey
|
6a24e97505
|
Merge "Merge commit '8fb7520a6d7720f69661f6fae9fd868726359dec' into HEAD" into nyc-mr1-dev-plus-aosp
|
2016-09-22 23:30:28 +00:00 |
|
Jeff Sharkey
|
6b6ad04934
|
Merge commit '8fb7520a6d7720f69661f6fae9fd868726359dec' into HEAD
Change-Id: I82b4752c4c8f8b0786f470695eac27102761fff7
|
2016-09-22 17:27:40 -06:00 |
|
Jaewan Kim
|
b7af1df93d
|
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31 am: 09edfde074 am: 1ab448b5d5 am: 5b649ddcc6 -s ours am: e36701214a
am: 2f713b8ad7
Change-Id: Ide8aba0aeb883e5c40f6d01eb8ac2b8f14521a5f
|
2016-09-22 23:26:51 +00:00 |
|
Jaewan Kim
|
cbea118189
|
DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be -s ours am: e9a9e2f055 am: 351aa0b320 am: 03bad07418 am: afab98a69e -s ours am: 738c21253a
am: 9b2aeba20a
Change-Id: I73a68d823db3cec064d095a1d514c255d86b57ea
|
2016-09-22 23:25:43 +00:00 |
|
Jaewan Kim
|
2f713b8ad7
|
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31 am: 09edfde074 am: 1ab448b5d5 am: 5b649ddcc6 -s ours
am: e36701214a
Change-Id: I45ecf1f660e94ef5487711b13d43f38931fb9447
|
2016-09-22 23:17:29 +00:00 |
|
Jaewan Kim
|
9b2aeba20a
|
DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be -s ours am: e9a9e2f055 am: 351aa0b320 am: 03bad07418 am: afab98a69e -s ours
am: 738c21253a
Change-Id: Ic596aa2c09ff2a3443020d24996bfd535413e4d8
|
2016-09-22 23:08:31 +00:00 |
|
Jaewan Kim
|
e36701214a
|
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31 am: 09edfde074 am: 1ab448b5d5
am: 5b649ddcc6 -s ours
Change-Id: I7de1101955e5152cd1fb5858ac93c9e94697b01b
|
2016-09-22 23:08:24 +00:00 |
|
Pavlin Radoslavov
|
cc68fc0edc
|
Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind" am: 3b0256fc73 am: 829285c38e
am: d0113aab0c
Change-Id: I369cef9da608f2175279245de8fb220e8012f3e5
|
2016-09-22 23:08:14 +00:00 |
|
Colin Cross
|
b62cc13c7c
|
Merge "aapt: remove duplicate definition of ZD" am: ac2d839d7c am: 3efa1e7c17
am: e43f2d4ef5
Change-Id: I71e7bfd44396aa2a7d79ba983bcc71d7684a36c1
|
2016-09-22 23:04:06 +00:00 |
|
Jaewan Kim
|
c1f00b916f
|
Merge "Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours am: 890f53a486 am: 1bf809c490 am: 6ad7c0f6ce -s ours am: 1c278e5652 am: bed7636243 am: dd883c7e87 am: 832179120f -s ours am: c547eeda12" into nyc-dev-plus-aosp
am: 3434f0f59e
Change-Id: I78d873443f769fd4337345d099dabe6500e1a3ab
|
2016-09-22 23:03:01 +00:00 |
|
Jaewan Kim
|
b22136c400
|
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours am: 890f53a486 am: 1bf809c490 am: 6ad7c0f6ce -s ours am: 1c278e5652 am: bed7636243 am: dd883c7e87 am: 832179120f -s ours am: c547eeda12
am: c9ceffd16c
Change-Id: I3456be6ed05ec85e45fbb90f33288b0e0fa02a5e
|
2016-09-22 23:02:57 +00:00 |
|
Jaewan Kim
|
fc5d123c9e
|
Merge "DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea am: 7eaeeb49bb am: 7ffaaca237 -s ours am: fa9983ec73 am: 900d1c90b3 am: 0e31d93890 am: 4da22f27f6 -s ours am: 36068a2f00" into nyc-dev-plus-aosp
am: 9e2319e78c
Change-Id: I64e8b58550b1f6121da9e3b5dd21545957f720dc
|
2016-09-22 23:01:12 +00:00 |
|
Jaewan Kim
|
7dc457bcd2
|
DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea am: 7eaeeb49bb am: 7ffaaca237 -s ours am: fa9983ec73 am: 900d1c90b3 am: 0e31d93890 am: 4da22f27f6 -s ours am: 36068a2f00
am: 6afd6e51fb
Change-Id: I796a4021d246a2eb884b106df25589ec502b3726
|
2016-09-22 23:01:09 +00:00 |
|
liulvping
|
e37ed040b1
|
Merge "Skip uninstalled package for getPackagesForUid()" am: f4c8c3590a am: 659cdfef75
am: fb55d69029
Change-Id: Id468596684eb071a477beff2e3e7185ed36cd7a3
|
2016-09-22 22:59:45 +00:00 |
|
Colin Cross
|
350d84d484
|
Merge "Merge "Remove has_trivial_move trait from StringPool types" am: d333f28397 am: 6f02f57f12" into nyc-dev-plus-aosp
am: 8ac28b8659
Change-Id: I96c7c5d2c4d43ecd8a2264a2b8290fddc1189f5a
|
2016-09-22 22:58:18 +00:00 |
|
Colin Cross
|
01496b46d9
|
Merge "Remove has_trivial_move trait from StringPool types" am: d333f28397 am: 6f02f57f12
am: 57ef0a40f1
Change-Id: If6fab1852e0e9b287a904fe4a4b556167ac0800d
|
2016-09-22 22:58:02 +00:00 |
|
Pavlin Radoslavov
|
d0113aab0c
|
Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind" am: 3b0256fc73
am: 829285c38e
Change-Id: I488915e4f0f8bcc9b90f61699f000831f2d393fe
|
2016-09-22 22:57:06 +00:00 |
|
Dirk Dougherty
|
05a9189e34
|
Copy IN files to ID, temporarily leaving IN in place. am: 9bbc0a2421 am: d6490cf9c0 am: f7f3f0f401
am: 4c9be8f738
Change-Id: I7d4c0e3223cebd57c684e646a750d8e66522534b
|
2016-09-22 22:52:39 +00:00 |
|
Jaewan Kim
|
738c21253a
|
DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be -s ours am: e9a9e2f055 am: 351aa0b320 am: 03bad07418
am: afab98a69e -s ours
Change-Id: I8ddca6c69539eb9cc568e5fcec011a3c58450fcc
|
2016-09-22 22:51:23 +00:00 |
|
Scott Main
|
d9cbcb77c4
|
Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev am: 8b05feb5b4 am: ba9db4b110 am: 33f2e08ec3
am: 49a0fd250f
Change-Id: I090d973fc9c4cfeb10eca5f475095ccbfcd49ef3
|
2016-09-22 22:51:21 +00:00 |
|
Colin Cross
|
e43f2d4ef5
|
Merge "aapt: remove duplicate definition of ZD" am: ac2d839d7c
am: 3efa1e7c17
Change-Id: Ie3109031c4a5499c6d5ff5e6ec097ab64c86d0b2
|
2016-09-22 22:51:08 +00:00 |
|
Ajay Panicker
|
ac684443a1
|
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9 -s ours am: 8919cc83bb -s ours am: 0241b6d88a am: 0fee65e58b am: 08fed21f2c -s ours am: 0029d03c0a am: afeaced48f am: 2a214fc5f2 am: 0ec10c8fdc -s ours am: 916552b0c9
am: b5b69a2004
Change-Id: Ie644851845a7187f7062f1b6d616eb7bb6fd7308
|
2016-09-22 22:48:01 +00:00 |
|
Dirk Dougherty
|
ead17a3afd
|
Copy IN files to ID, temporarily leaving IN in place. am: 9bbc0a2421
am: a0b58a6cf0
Change-Id: I8539d77021731648f6e33d1462c5abea2de9db6b
|
2016-09-22 22:47:06 +00:00 |
|
Scott Main
|
ca915af1a9
|
Merge "Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev am: 8b05feb5b4" into nyc-dev-plus-aosp
am: 62e519d02a
Change-Id: I20a3c59fcee2bee8e716bea52a964a3bd987a60e
|
2016-09-22 22:45:58 +00:00 |
|
Scott Main
|
351f756f51
|
Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev am: 8b05feb5b4
am: f9c35c961b
Change-Id: Ic9a267229a0fd245c3c8787e10462e64eef036a5
|
2016-09-22 22:45:54 +00:00 |
|
Adarsh Fernando
|
d5519c6a1a
|
Merge "Removing a temporary redirect for /ndk/guides/cmake.html am: dafcbfa693" into nyc-dev-plus-aosp
am: 8139010d37
Change-Id: I41532bcc42aab1f0ae81509ac30203ca1d8afa1a
|
2016-09-22 22:44:08 +00:00 |
|
Adarsh Fernando
|
a3e00cfa0e
|
Removing a temporary redirect for /ndk/guides/cmake.html am: dafcbfa693
am: 3955fef4b7
Change-Id: I7f5ab7db4af64b960de6d49327c3a23a9c317ec2
|
2016-09-22 22:44:06 +00:00 |
|
yuanhuihui
|
d105706775
|
Merge "[ActivityManager] Reset killed flag at attachApplicationLocked" am: 1d5447d70b am: 5820f7fff5
am: 689c4ab00a
Change-Id: I54afd53f6fe0219f33521295a2dde90e911a55f7
|
2016-09-22 22:43:18 +00:00 |
|
Ajay Panicker
|
04c7e841f5
|
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1 -s ours am: 7f84596929 -s ours am: ed82c6fac8 am: c1f8a09c1e am: 8091a00994 -s ours am: bc12dda3a7 am: ffe6090f7e am: a71d1c416b am: 081bea189d -s ours am: 34b14060c1
am: de7905cec5
Change-Id: I6387b62a1c4af90a5d6485a1cca081d275205003
|
2016-09-22 22:42:14 +00:00 |
|
Jaewan Kim
|
bf82360453
|
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d -s ours am: 298c104ae5 am: d9e8bfb8cf am: 8cb7a9fdb0 am: a13096f4c5 -s ours am: 36aa253b2b
am: d4167d7a0b
Change-Id: Ia3ba184d8772425bdc8bc10d4122ef0229547571
|
2016-09-22 22:41:17 +00:00 |
|
Jeff Sharkey
|
12de26b83b
|
Merge "Recursively restorecon when SELinux label changes." into nyc-mr1-dev
am: 8423493a85
Change-Id: I7f72932873fd437b07d662fd0c27af8b4baadbe1
|
2016-09-22 22:41:03 +00:00 |
|
Jeff Sharkey
|
8fb7520a6d
|
Recursively restorecon when SELinux label changes.
am: 7e2bb3e6dd
Change-Id: I964b2173f556077f2718abd5b30e156e1a9e6639
|
2016-09-22 22:40:38 +00:00 |
|
Jaewan Kim
|
5b649ddcc6
|
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31 am: 09edfde074
am: 1ab448b5d5
Change-Id: I4a1da4793ef9c53447742ea9e1f7a34fbffb8807
|
2016-09-22 22:40:32 +00:00 |
|
Jaewan Kim
|
e9c5b8b6ac
|
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: e9bb43ff8e
Change-Id: I7e09d3dca36a1f3272f2903eef963eb683a12912
|
2016-09-22 22:40:28 +00:00 |
|
Dirk Dougherty
|
4c9be8f738
|
Copy IN files to ID, temporarily leaving IN in place. am: 9bbc0a2421 am: d6490cf9c0
am: f7f3f0f401
Change-Id: I4f7f5dbd2d588bf139db87504500a429f71492d9
|
2016-09-22 22:39:44 +00:00 |
|
Pavlin Radoslavov
|
829285c38e
|
Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind"
am: 3b0256fc73
Change-Id: If33f7f2787ee94609e9fbb0ea52f66bdbdf57614
|
2016-09-22 22:39:31 +00:00 |
|
Jaewan Kim
|
afab98a69e
|
DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be -s ours am: e9a9e2f055 am: 351aa0b320
am: 03bad07418
Change-Id: Ia687cf7aa14eb11452d390d47bc13ba4dfba0cda
|
2016-09-22 22:39:30 +00:00 |
|
Jaewan Kim
|
ec8ef0d4d6
|
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: 8c53db264a
Change-Id: I9c4f145c642e1805b85dfaff113946dea8af3327
|
2016-09-22 22:39:29 +00:00 |
|
Android Build Merger (Role)
|
b078774a87
|
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: 6f6b07c9c7" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:32:30 +00:00 |
|
Jaewan Kim
|
b0a189e1cf
|
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: 6f6b07c9c7
Change-Id: I4678b9c2930d4fa0d2784512db7710dc53adcf11
|
2016-09-22 22:31:43 +00:00 |
|
Android Build Merger (Role)
|
0cc5cc4e6e
|
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: 7b348ecc95" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:31:21 +00:00 |
|
Ajay Panicker
|
9db8240bb1
|
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: 7b348ecc95
Change-Id: I86ebd091a475a844e6d66b42acaaf26bcff28e7a
|
2016-09-22 22:30:46 +00:00 |
|
Android Build Merger (Role)
|
8a0bb0b0e9
|
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: 553961fbcc" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:30:27 +00:00 |
|
Android Build Merger (Role)
|
4d3bd53d56
|
Merge "Removing a temporary redirect for /ndk/guides/cmake.html am: dafcbfa693 am: aff6881d04 am: 2eb458b8cd am: 854d5bf75b" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:30:07 +00:00 |
|
Ajay Panicker
|
ef8196c344
|
[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: 553961fbcc
Change-Id: Ie7e86eb563f40d5ff0d75ac04433f202fc71c550
|
2016-09-22 22:29:52 +00:00 |
|
Android Build Merger (Role)
|
edeefb0d58
|
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: fe3e7b181b" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:29:32 +00:00 |
|
Adarsh Fernando
|
0e08af7e08
|
Removing a temporary redirect for /ndk/guides/cmake.html am: dafcbfa693 am: aff6881d04 am: 2eb458b8cd
am: 854d5bf75b
Change-Id: Ie1fe5f32f51a4bc2541913011cbdf0c3799416ae
|
2016-09-22 22:29:25 +00:00 |
|
Android Build Merger (Role)
|
1a2973baee
|
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1 -s ours am: 7f84596929 -s ours am: ed82c6fac8 am: c1f8a09c1e am: 8091a00994 -s ours am: bc12dda3a7 am: ffe6090f7e am: a71d1c416b am: 081bea189d -s ours am: 34b14060c1 am: 45c45d359e am: dc9c76c306 am: 602e5dda33" into nyc-mr1-dev-plus-aosp
|
2016-09-22 22:29:07 +00:00 |
|
Ajay Panicker
|
7ee9869ac6
|
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: fe3e7b181b
Change-Id: I0d94265b2f44892d737969213db25aeb0baf4d33
|
2016-09-22 22:28:56 +00:00 |
|