OSDN Git Service
Jerry Zhang [Thu, 6 Jul 2017 17:17:02 +0000 (17:17 +0000)]
Merge "Broadcast only if boot complete" into oc-dr1-dev am:
b60c48a6a2
am:
4501186a6c
Change-Id: Ib65430aa0ff6a115fcd867fc6c8c0e4e7d9a03fc
Jerry Zhang [Thu, 6 Jul 2017 17:10:40 +0000 (17:10 +0000)]
Merge "Broadcast only if boot complete" into oc-dr1-dev
am:
b60c48a6a2
Change-Id: I99f2ec3d45fa69be68aa52aa769929645f8432cf
Doris Ling [Thu, 6 Jul 2017 17:09:11 +0000 (17:09 +0000)]
Merge "Update the max height/width attribute of the TwoTargetPreference icon."
Android Build Merger (Role) [Thu, 6 Jul 2017 17:02:12 +0000 (17:02 +0000)]
Merge "Merge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev am:
789f10fe12 am:
e510562e75"
Android Build Merger (Role) [Thu, 6 Jul 2017 17:02:00 +0000 (17:02 +0000)]
Merge "Merge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev am:
789f10fe12 am:
e510562e75"
Adrian Roos [Thu, 6 Jul 2017 17:01:11 +0000 (17:01 +0000)]
Merge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev am:
789f10fe12
am:
e510562e75
Change-Id: Ibc40e0723c73f899510a6f1299bdda914a42cb58
Adrian Roos [Thu, 6 Jul 2017 17:01:00 +0000 (17:01 +0000)]
Merge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev am:
789f10fe12
am:
e510562e75
Change-Id: Idb953e1b1a1b574e433d90d2f92b1a96c33808f1
Rubin Xu [Thu, 6 Jul 2017 17:00:31 +0000 (17:00 +0000)]
Merge "Add more javadoc to ConnectEvent and DnsEvent"
Android Build Merger (Role) [Thu, 6 Jul 2017 16:56:39 +0000 (16:56 +0000)]
Merge "Merge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am:
9731c8bfef" into oc-dr1-dev-plus-aosp am:
f79a7cddff"
Android Build Merger (Role) [Thu, 6 Jul 2017 16:55:46 +0000 (16:55 +0000)]
Merge "Merge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am:
9731c8bfef" into oc-dr1-dev-plus-aosp am:
f79a7cddff"
Adrian Roos [Thu, 6 Jul 2017 16:54:37 +0000 (16:54 +0000)]
Merge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am:
9731c8bfef" into oc-dr1-dev-plus-aosp
am:
f79a7cddff
Change-Id: I2857045d95705b00f96cd5cdb69b3fea0cfb1f8d
Adrian Roos [Thu, 6 Jul 2017 16:54:32 +0000 (16:54 +0000)]
Merge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am:
9731c8bfef" into oc-dr1-dev-plus-aosp
am:
f79a7cddff
Change-Id: I97f4019f72e99439a2ffe1518f04303f223a873b
Android Build Merger (Role) [Thu, 6 Jul 2017 16:54:14 +0000 (16:54 +0000)]
Merge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am:
9731c8bfef am:
7ba5f8e2ec"
Android Build Merger (Role) [Thu, 6 Jul 2017 16:54:03 +0000 (16:54 +0000)]
Merge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am:
9731c8bfef am:
7ba5f8e2ec"
Adrian Roos [Thu, 6 Jul 2017 16:53:14 +0000 (16:53 +0000)]
Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am:
9731c8bfef
am:
7ba5f8e2ec
Change-Id: I0eed02ecb97c5908b28516c139b4c483cdff4841
Android Build Merger (Role) [Thu, 6 Jul 2017 16:52:50 +0000 (16:52 +0000)]
Merge "Merge "Merge "Fix tests?" into oc-dr1-dev am:
f22c79a27b" into oc-dr1-dev-plus-aosp am:
5b0a2266bf"
Adrian Roos [Thu, 6 Jul 2017 16:52:45 +0000 (16:52 +0000)]
Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am:
9731c8bfef
am:
7ba5f8e2ec
Change-Id: Ic34bdbb938bf623b8fbc94d93c102046c44e6df5
Android Build Merger (Role) [Thu, 6 Jul 2017 16:52:06 +0000 (16:52 +0000)]
Merge "Merge "Merge "Fix tests?" into oc-dr1-dev am:
f22c79a27b" into oc-dr1-dev-plus-aosp am:
5b0a2266bf"
Jerry Zhang [Thu, 6 Jul 2017 16:52:04 +0000 (16:52 +0000)]
Merge "Broadcast only if boot complete" into oc-dr1-dev
Jason Monk [Thu, 6 Jul 2017 16:51:16 +0000 (16:51 +0000)]
Merge "Merge "Fix tests?" into oc-dr1-dev am:
f22c79a27b" into oc-dr1-dev-plus-aosp
am:
5b0a2266bf
Change-Id: I1fdcd49cb75c5b7a9cc10c655dcc486a849688e2
Jason Monk [Thu, 6 Jul 2017 16:51:00 +0000 (16:51 +0000)]
Merge "Merge "Fix tests?" into oc-dr1-dev am:
f22c79a27b" into oc-dr1-dev-plus-aosp
am:
5b0a2266bf
Change-Id: I1f680d72b6a2d7730e081574aaac04f5e802c831
Android Build Merger (Role) [Thu, 6 Jul 2017 16:50:48 +0000 (16:50 +0000)]
Merge "Merge "Merge "Fix tests?" into oc-dr1-dev am:
f22c79a27b" into oc-dr1-dev-plus-aosp am:
16670ea2ae"
Android Build Merger (Role) [Thu, 6 Jul 2017 16:50:32 +0000 (16:50 +0000)]
Merge "Merge "Merge "Fix tests?" into oc-dr1-dev am:
f22c79a27b" into oc-dr1-dev-plus-aosp am:
16670ea2ae"
Jason Monk [Thu, 6 Jul 2017 16:49:37 +0000 (16:49 +0000)]
Merge "Merge "Fix tests?" into oc-dr1-dev am:
f22c79a27b" into oc-dr1-dev-plus-aosp
am:
16670ea2ae
Change-Id: Ifce815fa63555077491847c4c2f24bf1da275210
Jason Monk [Thu, 6 Jul 2017 16:49:22 +0000 (16:49 +0000)]
Merge "Merge "Fix tests?" into oc-dr1-dev am:
f22c79a27b" into oc-dr1-dev-plus-aosp
am:
16670ea2ae
Change-Id: Ic5797fd2047010ee054b7aff199f490569efa3f3
Android Build Merger (Role) [Thu, 6 Jul 2017 16:49:03 +0000 (16:49 +0000)]
Merge "Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am:
c3fef742c0" into oc-dr1-dev-plus-aosp am:
b91e635fa4"
Android Build Merger (Role) [Thu, 6 Jul 2017 16:48:48 +0000 (16:48 +0000)]
Merge "Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am:
c3fef742c0" into oc-dr1-dev-plus-aosp am:
b91e635fa4"
Adrian Roos [Thu, 6 Jul 2017 16:47:43 +0000 (16:47 +0000)]
Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am:
c3fef742c0" into oc-dr1-dev-plus-aosp
am:
b91e635fa4
Change-Id: Ic3f3c67dee73dd4b23e47853083e4cbf604564bf
Adrian Roos [Thu, 6 Jul 2017 16:47:26 +0000 (16:47 +0000)]
Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am:
c3fef742c0" into oc-dr1-dev-plus-aosp
am:
b91e635fa4
Change-Id: Ic6337edf70a55cc4141dfe70e92565cd73b661d1
Android Build Merger (Role) [Thu, 6 Jul 2017 16:47:12 +0000 (16:47 +0000)]
Merge "Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am:
c3fef742c0" into oc-dr1-dev-plus-aosp am:
a37d44df8f"
Android Build Merger (Role) [Thu, 6 Jul 2017 16:46:44 +0000 (16:46 +0000)]
Merge "Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am:
c3fef742c0" into oc-dr1-dev-plus-aosp am:
a37d44df8f"
Adrian Roos [Thu, 6 Jul 2017 16:46:02 +0000 (16:46 +0000)]
Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am:
c3fef742c0" into oc-dr1-dev-plus-aosp
am:
a37d44df8f
Change-Id: I472fb2852dcb6d01bfd84fcccda72ae18a0a4c76
Adrian Roos [Thu, 6 Jul 2017 16:45:49 +0000 (16:45 +0000)]
Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am:
c3fef742c0" into oc-dr1-dev-plus-aosp
am:
a37d44df8f
Change-Id: I79bc12ce0c1333ceeefa233acd17088550c08aca
Android Build Merger (Role) [Thu, 6 Jul 2017 16:45:33 +0000 (16:45 +0000)]
Merge "Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am:
ab7af71c64" into oc-dr1-dev-plus-aosp am:
763c1d1e24"
Android Build Merger (Role) [Thu, 6 Jul 2017 16:45:08 +0000 (16:45 +0000)]
Merge "Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am:
ab7af71c64" into oc-dr1-dev-plus-aosp am:
763c1d1e24"
Evan Laird [Thu, 6 Jul 2017 16:44:16 +0000 (16:44 +0000)]
Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am:
ab7af71c64" into oc-dr1-dev-plus-aosp
am:
763c1d1e24
Change-Id: I1705d3d1a3eed04689c72bd83251037ebda11d6f
Evan Laird [Thu, 6 Jul 2017 16:44:14 +0000 (16:44 +0000)]
Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am:
ab7af71c64" into oc-dr1-dev-plus-aosp
am:
763c1d1e24
Change-Id: I78fe9027d1af153226243290e7461a09544d88c1
Android Build Merger (Role) [Thu, 6 Jul 2017 16:43:39 +0000 (16:43 +0000)]
Merge "Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am:
ab7af71c64" into oc-dr1-dev-plus-aosp am:
4a17866abe"
Android Build Merger (Role) [Thu, 6 Jul 2017 16:43:24 +0000 (16:43 +0000)]
Merge "Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am:
ab7af71c64" into oc-dr1-dev-plus-aosp am:
4a17866abe"
Evan Laird [Thu, 6 Jul 2017 16:42:43 +0000 (16:42 +0000)]
Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am:
ab7af71c64" into oc-dr1-dev-plus-aosp
am:
4a17866abe
Change-Id: Ic38e272a6556d25c21b5842e66f70d9fc00d7afa
Evan Laird [Thu, 6 Jul 2017 16:42:23 +0000 (16:42 +0000)]
Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am:
ab7af71c64" into oc-dr1-dev-plus-aosp
am:
4a17866abe
Change-Id: I74bdb99daa76266ea2f4a6a62f3f4dafffcbf45b
Android Build Merger (Role) [Thu, 6 Jul 2017 16:42:02 +0000 (16:42 +0000)]
Merge "Merge "Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev am:
7b04275a68" into oc-dr1-dev-plus-aosp am:
39f9b4db53"
Android Build Merger (Role) [Thu, 6 Jul 2017 16:41:52 +0000 (16:41 +0000)]
Merge "Merge "Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev am:
7b04275a68" into oc-dr1-dev-plus-aosp am:
39f9b4db53"
Selim Cinek [Thu, 6 Jul 2017 16:40:57 +0000 (16:40 +0000)]
Merge "Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev am:
7b04275a68" into oc-dr1-dev-plus-aosp
am:
39f9b4db53
Change-Id: Ib2ffe3304c3d8eb96c73d07cff41b4c47b995503
Selim Cinek [Thu, 6 Jul 2017 16:40:41 +0000 (16:40 +0000)]
Merge "Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev am:
7b04275a68" into oc-dr1-dev-plus-aosp
am:
39f9b4db53
Change-Id: I950e658414a32c6d7d09082f582d56cff47dc5e0
Android Build Merger (Role) [Thu, 6 Jul 2017 16:40:28 +0000 (16:40 +0000)]
Merge "Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev am:
7b04275a68 am:
f53ce454f4"
Selim Cinek [Thu, 6 Jul 2017 16:39:10 +0000 (16:39 +0000)]
Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev am:
7b04275a68
am:
f53ce454f4
Change-Id: I1018d51c400de084cff8c4de7c633488c9f6070f
Selim Cinek [Thu, 6 Jul 2017 16:38:59 +0000 (16:38 +0000)]
Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev am:
7b04275a68
am:
f53ce454f4
Change-Id: I763d062729a083c29f53bd2c5065fd07762f0bf3
John Reck [Thu, 6 Jul 2017 16:34:04 +0000 (16:34 +0000)]
Merge "Move frame history into jank tracker"
TreeHugger Robot [Thu, 6 Jul 2017 16:32:30 +0000 (16:32 +0000)]
Merge "Print exception object when meminfo goes bad"
Adrian Roos [Thu, 6 Jul 2017 16:31:27 +0000 (16:31 +0000)]
Merge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev
am:
789f10fe12
Change-Id: I86bf782941a26766de14e187270540dac32cf73a
Android Build Merger (Role) [Thu, 6 Jul 2017 16:30:15 +0000 (16:30 +0000)]
Merge "Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am:
d2eef601f6" into oc-dr1-dev-plus-aosp am:
2b32e4992e"
Android Build Merger (Role) [Thu, 6 Jul 2017 16:29:52 +0000 (16:29 +0000)]
Merge "Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am:
d2eef601f6" into oc-dr1-dev-plus-aosp am:
2b32e4992e"
Lorenzo Colitti [Thu, 6 Jul 2017 16:29:04 +0000 (16:29 +0000)]
Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am:
d2eef601f6" into oc-dr1-dev-plus-aosp
am:
2b32e4992e
Change-Id: Ic69cc209c2afbb99580998bb77f3b7df80afe8be
Lorenzo Colitti [Thu, 6 Jul 2017 16:28:32 +0000 (16:28 +0000)]
Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am:
d2eef601f6" into oc-dr1-dev-plus-aosp
am:
2b32e4992e
Change-Id: Iaafa4739f5e116fd94c60d662f9c9d09d56fe06e
Android Build Merger (Role) [Thu, 6 Jul 2017 16:27:32 +0000 (16:27 +0000)]
Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am:
d2eef601f6 am:
f00aadf535"
Android Build Merger (Role) [Thu, 6 Jul 2017 16:26:07 +0000 (16:26 +0000)]
Merge "Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev am:
9731c8bfef" into oc-dr1-dev-plus-aosp
Lorenzo Colitti [Thu, 6 Jul 2017 16:25:48 +0000 (16:25 +0000)]
Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am:
d2eef601f6
am:
f00aadf535
Change-Id: I083aac710590a461f2c12735e0daaf35a6f35387
Lorenzo Colitti [Thu, 6 Jul 2017 16:25:24 +0000 (16:25 +0000)]
Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am:
d2eef601f6
am:
f00aadf535
Change-Id: I0c25ea79b2f62fa548c4ed5cccb398530f138822
Adrian Roos [Thu, 6 Jul 2017 16:25:05 +0000 (16:25 +0000)]
Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev
am:
9731c8bfef
Change-Id: Ic5cec922b3492c6ea27c89c2260ba6bfa1febedb
Adrian Roos [Thu, 6 Jul 2017 16:24:43 +0000 (16:24 +0000)]
Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev
am:
9731c8bfef
Change-Id: I3fff6c1d14b6611a8e2700bc5b6cafcbd2420fa0
TreeHugger Robot [Thu, 6 Jul 2017 16:20:19 +0000 (16:20 +0000)]
Merge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 16:20:17 +0000 (16:20 +0000)]
Merge "Merge "Fix tests?" into oc-dr1-dev am:
f22c79a27b" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 16:19:40 +0000 (16:19 +0000)]
Merge "Merge "Fix tests?" into oc-dr1-dev am:
f22c79a27b" into oc-dr1-dev-plus-aosp
Jason Monk [Thu, 6 Jul 2017 16:19:11 +0000 (16:19 +0000)]
Merge "Fix tests?" into oc-dr1-dev
am:
f22c79a27b
Change-Id: I5697df0de7367aacf4e1765c241e4311a9b293b5
Jason Monk [Thu, 6 Jul 2017 16:18:48 +0000 (16:18 +0000)]
Merge "Fix tests?" into oc-dr1-dev
am:
f22c79a27b
Change-Id: I28ff128653f9ffa65d8e3e0ee3af9368a0d194c4
Android Build Merger (Role) [Thu, 6 Jul 2017 16:18:46 +0000 (16:18 +0000)]
Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am:
c3fef742c0" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 16:18:01 +0000 (16:18 +0000)]
Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am:
c3fef742c0" into oc-dr1-dev-plus-aosp
Adrian Roos [Thu, 6 Jul 2017 16:17:26 +0000 (16:17 +0000)]
Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev
am:
c3fef742c0
Change-Id: Ie50de879916ce5b9a48728eee0054fc54b5f1fac
Android Build Merger (Role) [Thu, 6 Jul 2017 16:17:04 +0000 (16:17 +0000)]
Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am:
ab7af71c64" into oc-dr1-dev-plus-aosp
Adrian Roos [Thu, 6 Jul 2017 16:16:58 +0000 (16:16 +0000)]
Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev
am:
c3fef742c0
Change-Id: If13721952bf6651b87e13567067a241b1e7b3c95
Android Build Merger (Role) [Thu, 6 Jul 2017 16:16:38 +0000 (16:16 +0000)]
Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am:
ab7af71c64" into oc-dr1-dev-plus-aosp
Evan Laird [Thu, 6 Jul 2017 16:15:51 +0000 (16:15 +0000)]
Merge "Don't animate grayscale if animations are off" into oc-dr1-dev
am:
ab7af71c64
Change-Id: I4bb89c8045d1aee0441882556819d0187a2349b8
Android Build Merger (Role) [Thu, 6 Jul 2017 16:15:24 +0000 (16:15 +0000)]
Merge "Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev am:
7b04275a68" into oc-dr1-dev-plus-aosp
Evan Laird [Thu, 6 Jul 2017 16:15:17 +0000 (16:15 +0000)]
Merge "Don't animate grayscale if animations are off" into oc-dr1-dev
am:
ab7af71c64
Change-Id: I598597675ce0dd2373625ac1968217e42576b692
Selim Cinek [Thu, 6 Jul 2017 16:14:10 +0000 (16:14 +0000)]
Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev
am:
7b04275a68
Change-Id: I0f67b6aeb6b770df12679fc333f506b67e79b5f3
Selim Cinek [Thu, 6 Jul 2017 16:13:39 +0000 (16:13 +0000)]
Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev
am:
7b04275a68
Change-Id: I2997be04f1b6b518bc11dd291e2ae1fba55453ea
TreeHugger Robot [Thu, 6 Jul 2017 16:12:05 +0000 (16:12 +0000)]
Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 16:10:57 +0000 (16:10 +0000)]
Merge "Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev am:
d2eef601f6" into oc-dr1-dev-plus-aosp
Lorenzo Colitti [Thu, 6 Jul 2017 16:09:49 +0000 (16:09 +0000)]
Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev
am:
d2eef601f6
Change-Id: I8297ca8d29d3aab18884a35953b0021ec265ce26
Lorenzo Colitti [Thu, 6 Jul 2017 16:09:30 +0000 (16:09 +0000)]
Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev
am:
d2eef601f6
Change-Id: Ibc89ffd87fb87cd95f941b2bbd67469d961cb13e
TreeHugger Robot [Thu, 6 Jul 2017 16:09:00 +0000 (16:09 +0000)]
Merge "Fix tests?" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 16:07:17 +0000 (16:07 +0000)]
Merge "ActivityManagerService: Improve file naming for ANR traces."
TreeHugger Robot [Thu, 6 Jul 2017 16:01:30 +0000 (16:01 +0000)]
Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 15:34:48 +0000 (15:34 +0000)]
Merge "Don't animate grayscale if animations are off" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 15:26:56 +0000 (15:26 +0000)]
Merge "Merge "Merge "Layout updates to share sheet" into oc-dr1-dev am:
2a050dae1a" into oc-dr1-dev-plus-aosp am:
1ffc148c09"
Jason Monk [Thu, 6 Jul 2017 15:25:56 +0000 (15:25 +0000)]
Merge "Merge "Layout updates to share sheet" into oc-dr1-dev am:
2a050dae1a" into oc-dr1-dev-plus-aosp
am:
1ffc148c09
Change-Id: I52206e80556a0a407eabce27023277a5beb76150
Android Build Merger (Role) [Thu, 6 Jul 2017 15:25:27 +0000 (15:25 +0000)]
Merge "Merge "Layout updates to share sheet" into oc-dr1-dev am:
2a050dae1a am:
28e83de5ae"
Jason Monk [Thu, 6 Jul 2017 15:24:24 +0000 (15:24 +0000)]
Merge "Layout updates to share sheet" into oc-dr1-dev am:
2a050dae1a
am:
28e83de5ae
Change-Id: I3a3ef4076cd24cdffe939829b1da89057c0140a7
Jason Monk [Thu, 6 Jul 2017 15:23:57 +0000 (15:23 +0000)]
Merge "Layout updates to share sheet" into oc-dr1-dev am:
2a050dae1a
am:
28e83de5ae
Change-Id: I1b2b1c459e321407475a1c68fd098d6256337371
TreeHugger Robot [Thu, 6 Jul 2017 15:23:09 +0000 (15:23 +0000)]
Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 15:20:00 +0000 (15:20 +0000)]
Merge "Merge "Layout updates to share sheet" into oc-dr1-dev am:
2a050dae1a" into oc-dr1-dev-plus-aosp
Lorenzo Colitti [Thu, 6 Jul 2017 15:19:15 +0000 (15:19 +0000)]
Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev
Jason Monk [Thu, 6 Jul 2017 15:19:02 +0000 (15:19 +0000)]
Merge "Layout updates to share sheet" into oc-dr1-dev
am:
2a050dae1a
Change-Id: I9c9a20d046c3dce3b107903229a570db59c8a51d
Jason Monk [Thu, 6 Jul 2017 15:18:25 +0000 (15:18 +0000)]
Merge "Layout updates to share sheet" into oc-dr1-dev
am:
2a050dae1a
Change-Id: I1243c4def83a7b116373af01dda2cb883a036e09
TreeHugger Robot [Thu, 6 Jul 2017 15:09:10 +0000 (15:09 +0000)]
Merge "Layout updates to share sheet" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 14:46:19 +0000 (14:46 +0000)]
Merge "Merge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev am:
f96da7ee6f am:
ab95597f85"
Selim Cinek [Thu, 6 Jul 2017 14:45:19 +0000 (14:45 +0000)]
Merge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev am:
f96da7ee6f
am:
ab95597f85
Change-Id: I09a8181bcddc14462cb0756fcc4977636b7d4698
Selim Cinek [Thu, 6 Jul 2017 14:43:59 +0000 (14:43 +0000)]
Merge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev am:
f96da7ee6f
am:
ab95597f85
Change-Id: I2a2c3731c2494a7059c8795148920a42dc978025
Rubin Xu [Thu, 6 Jul 2017 14:04:46 +0000 (15:04 +0100)]
Add more javadoc to ConnectEvent and DnsEvent
Bug:
63382615
Test: make -j32 docs
Change-Id: I78c35ac2e4fee827d835e0b40b8e769bf1fa553d
OSDN Git Service
