OSDN Git Service
Android Build Merger (Role) [Thu, 6 Jul 2017 17:18:55 +0000 (17:18 +0000)]
Merge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am:
25937550af" into oc-dr1-dev-plus-aosp
Daniel Nishi [Thu, 6 Jul 2017 17:17:11 +0000 (17:17 +0000)]
Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev
am:
25937550af
Change-Id: If4b01fcf9e984546f9242446dcb3d02efe4725af
Daniel Nishi [Thu, 6 Jul 2017 17:15:24 +0000 (17:15 +0000)]
Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev
am:
25937550af
Change-Id: I53435cc58c29fd72cecca91e730cbfd745c35ef6
Android Build Merger (Role) [Thu, 6 Jul 2017 17:12:04 +0000 (17:12 +0000)]
Merge "Merge "Broadcast only if boot complete" into oc-dr1-dev am:
b60c48a6a2" into oc-dr1-dev-plus-aosp
Jerry Zhang [Thu, 6 Jul 2017 17:10:55 +0000 (17:10 +0000)]
Merge "Broadcast only if boot complete" into oc-dr1-dev
am:
b60c48a6a2
Change-Id: I53d2958b56ee6b48457741268e8578dc3316091c
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
Daniel Nishi [Thu, 6 Jul 2017 17:04:59 +0000 (17:04 +0000)]
Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev
Jerry Zhang [Thu, 6 Jul 2017 16:52:04 +0000 (16:52 +0000)]
Merge "Broadcast only if boot complete" into oc-dr1-dev
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: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
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: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
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
Selim Cinek [Thu, 6 Jul 2017 14:38:24 +0000 (14:38 +0000)]
Merge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev
am:
f96da7ee6f
Change-Id: I73e4bc5115959ae38052be25effa736576eb0ba9
TreeHugger Robot [Thu, 6 Jul 2017 14:32:53 +0000 (14:32 +0000)]
Merge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev
Jason Monk [Thu, 6 Jul 2017 13:51:47 +0000 (09:51 -0400)]
Fix tests?
Test: runtest systemui
Change-Id: Ie29ff934fbb6eeab977fd2977ea7f3a1d31170e9
Fixes:
63382815
Adrian Roos [Thu, 6 Jul 2017 13:36:32 +0000 (15:36 +0200)]
LockIcon: Initialize mAccessibilityController
Otherwise updating the clickability never happens.
Change-Id: I8a7ec61b25b0862de8cb0122017cf4064b20bcb3
Fixes:
62695092
Test: Disable security. Click on lock icon. Ensure it shows the unlock hint, and does not show that the device has been locked.
Android Build Merger (Role) [Thu, 6 Jul 2017 13:23:19 +0000 (13:23 +0000)]
Merge "Merge "Fix some config issues with sysui" into oc-dr1-dev am:
f636e3fb52" into oc-dr1-dev-plus-aosp
Jason Monk [Thu, 6 Jul 2017 13:21:37 +0000 (13:21 +0000)]
Merge "Fix some config issues with sysui" into oc-dr1-dev
am:
f636e3fb52
Change-Id: Iac9ad5693df97185575e4d620aebf00fd19870fa
Jason Monk [Thu, 6 Jul 2017 13:20:18 +0000 (13:20 +0000)]
Merge "Fix some config issues with sysui" into oc-dr1-dev
am:
f636e3fb52
Change-Id: Ib9b38c8eb8c6452e7d12f2ced2b499292c000277
Jason Monk [Thu, 6 Jul 2017 13:13:55 +0000 (13:13 +0000)]
Merge "Fix some config issues with sysui" into oc-dr1-dev
Jason Monk [Tue, 27 Jun 2017 22:37:35 +0000 (18:37 -0400)]
Layout updates to share sheet
The biggest change is that padding will only appear above/below
service section, and at the start of the non-service section. For
this a bunch of changes to how padding is needed.
Also some other dimen changes for specs.
Test: visual
Change-Id: I39747701597e620425bdcb4113d1a3585f6de137
Fixes:
37913738
Android Build Merger (Role) [Thu, 6 Jul 2017 11:37:57 +0000 (11:37 +0000)]
Merge "Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev am:
84e0f453d1" into oc-dr1-dev-plus-aosp
Narayan Kamath [Thu, 6 Jul 2017 11:36:48 +0000 (11:36 +0000)]
Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev
am:
84e0f453d1
Change-Id: I17a572fa28c1371ef51753ff236f569a018df063
Narayan Kamath [Thu, 6 Jul 2017 11:36:41 +0000 (11:36 +0000)]
Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev
am:
84e0f453d1
Change-Id: I34dc28cd87e5111fccff05893ddf5c1155ad8746
TreeHugger Robot [Thu, 6 Jul 2017 11:30:03 +0000 (11:30 +0000)]
Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev
Joel Scherpelz [Thu, 8 Jun 2017 06:35:21 +0000 (15:35 +0900)]
Wakeup packet mark/mask configuration option
Rules will only be installed if a device specific config.xml overrides
the default values of mark and mask.
This change also fixes a bug where wakeup rules added by the wakeup
controller would never be removed because updateInterfaces() is not
invoked on wifi network change or disable.
Test: as follows
- built
- flashed
- booted
- Manually verified that mask/mark is set correctly
Bug:
28806131
(cherry picked from commit
668370b9a5d36511f8f2cd58d6c6b0fc1020ee2d)
Change-Id: I95e75b11b973707bcb428ea6498fbfd8e717b855
Android Build Merger (Role) [Thu, 6 Jul 2017 08:30:45 +0000 (08:30 +0000)]
Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp am:
d29b77a59e -s ours" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:28:54 +0000 (08:28 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp
am:
d29b77a59e -s ours
Change-Id: Ie78baf6e151ea2504a71403e18b0bc148720cf7d
Android Build Merger (Role) [Thu, 6 Jul 2017 08:28:13 +0000 (08:28 +0000)]
Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp am:
d29b77a59e -s ours" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:25:13 +0000 (08:25 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp
am:
d29b77a59e -s ours
Change-Id: Ie604bafda0f2259c6f2a9a6c4fe3964e9ba01384
Android Build Merger (Role) [Thu, 6 Jul 2017 08:24:27 +0000 (08:24 +0000)]
Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp am:
4568cf1c82 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 08:22:45 +0000 (08:22 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56" into oc-dev-plus-aosp am:
94a7d5bfcf -s ours" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:22:32 +0000 (08:22 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp
am:
4568cf1c82 -s ours
Change-Id: I1ea2c650ed2a45265caa440c1d82efd724b57a15
Android Build Merger (Role) [Thu, 6 Jul 2017 08:21:28 +0000 (08:21 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56" into oc-dev-plus-aosp am:
94a7d5bfcf -s ours" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:21:03 +0000 (08:21 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56" into oc-dev-plus-aosp
am:
94a7d5bfcf -s ours
Change-Id: I0388ba2add121b330b8ddf4f75a0d6a04f0c2254
Erik Kline [Thu, 6 Jul 2017 08:20:09 +0000 (08:20 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56" into oc-dev-plus-aosp
am:
94a7d5bfcf -s ours
Change-Id: I8cc27f38c1787859ebaae075f40649dbf6169e7e
Android Build Merger (Role) [Thu, 6 Jul 2017 08:20:08 +0000 (08:20 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56 am:
462232a92f -s ours" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:19:02 +0000 (08:19 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56
am:
462232a92f -s ours
Change-Id: I29b398c6665083e0807a5ff0f84cb8b074642820
Erik Kline [Thu, 6 Jul 2017 08:18:12 +0000 (08:18 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56
am:
462232a92f -s ours
Change-Id: I9945181d664321b968dd6f348699b344f5f73390
Android Build Merger (Role) [Thu, 6 Jul 2017 08:13:28 +0000 (08:13 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 08:13:00 +0000 (08:13 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:11:55 +0000 (08:11 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master
am:
311b2a31fa
Change-Id: If2fa9371bc286d2115167b8187f641ec9dfb89a9
Erik Kline [Thu, 6 Jul 2017 08:11:44 +0000 (08:11 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master
am:
311b2a31fa
Change-Id: I462aa9d52205b1dff46b074e5a13945c34e96890
Android Build Merger (Role) [Thu, 6 Jul 2017 08:11:03 +0000 (08:11 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56" into oc-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:10:00 +0000 (08:10 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19
am:
aa9d12fa56
Change-Id: Iae705d2522f1a21e7aa970a4c16efd41943031ab
Erik Kline [Thu, 6 Jul 2017 08:09:13 +0000 (08:09 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19
am:
aa9d12fa56
Change-Id: I9097493cec6ac13dc027ee1d2f13bbe52679e674
Android Build Merger (Role) [Thu, 6 Jul 2017 08:04:24 +0000 (08:04 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master
Erik Kline [Thu, 6 Jul 2017 08:03:19 +0000 (08:03 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()"
am:
b171a46d19
Change-Id: Ic74dcee4e473e4b6498b16affad88706bb4a6b7e
Erik Kline [Thu, 6 Jul 2017 08:02:44 +0000 (08:02 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()"
am:
b171a46d19
Change-Id: I999926bf0b67b12caadeea2d3766d8f69913bafe
Treehugger Robot [Thu, 6 Jul 2017 07:54:33 +0000 (07:54 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()"
Erik Kline [Thu, 6 Jul 2017 03:38:48 +0000 (12:38 +0900)]
Clearly log tether_offload_disabled setting status in start()
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
29337859
Bug:
32163131
Change-Id: I113358ef71c2e5e3254eb6f9fbf9d5721825b0df
Merged-In: Iebcdb7bfaa85f822e73fe2f3b54caceb5420709c
Merged-In: Ifce832dca7b4d8b3056e2a9e91d38bffe25cfeb6
Merged-In: I99f6abc31579b4b25589452c44e1834a7ba4e591
Merged-In: I312a9309d6934bcec7fc0245cad12b97f1a22521
Lorenzo Colitti [Thu, 6 Jul 2017 06:31:54 +0000 (06:31 +0000)]
Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev
am:
cf694adee3
Change-Id: Ie6c5d55ce610a44b627eb8a7c46b897146f0e051
TreeHugger Robot [Thu, 6 Jul 2017 06:14:00 +0000 (06:14 +0000)]
Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev
Erik Kline [Thu, 6 Jul 2017 05:56:14 +0000 (05:56 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" into oc-dr1-dev
am:
f12ff31046
Change-Id: I99f6abc31579b4b25589452c44e1834a7ba4e591
TreeHugger Robot [Thu, 6 Jul 2017 05:47:59 +0000 (05:47 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 05:27:28 +0000 (05:27 +0000)]
Merge "Merge "Fix NPE on network forget from details page." into oc-dr1-dev am:
e59ba746f1" into oc-dr1-dev-plus-aosp
Sundeep Ghuman [Thu, 6 Jul 2017 05:25:45 +0000 (05:25 +0000)]
Merge "Fix NPE on network forget from details page." into oc-dr1-dev
am:
e59ba746f1
Change-Id: I419395b77528e5a200411b88940e05af310c37d6
Sundeep Ghuman [Thu, 6 Jul 2017 05:24:56 +0000 (05:24 +0000)]
Merge "Fix NPE on network forget from details page." into oc-dr1-dev
am:
e59ba746f1
Change-Id: I9bb7d9e9ea8b174ba2fe1d77d110cef658e152c8
TreeHugger Robot [Thu, 6 Jul 2017 05:16:14 +0000 (05:16 +0000)]
Merge "Fix NPE on network forget from details page." into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 03:49:05 +0000 (03:49 +0000)]
Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am:
161d65640e" into oc-dr1-dev-plus-aosp
Winson Chung [Thu, 6 Jul 2017 03:47:54 +0000 (03:47 +0000)]
Merge "Moving check for empty snapshots earlier." into oc-dr1-dev
am:
161d65640e
Change-Id: Ib6e32651f0a24462485d8671f9122af297fcb5ba
Android Build Merger (Role) [Thu, 6 Jul 2017 03:47:22 +0000 (03:47 +0000)]
Merge "Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev am:
7ee9ec59d8" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 03:46:47 +0000 (03:46 +0000)]
Merge "Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master am:
e62a5fc7d3" into oc-dev-plus-aosp am:
f9d61556b6" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 03:46:23 +0000 (03:46 +0000)]
Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am:
161d65640e" into oc-dr1-dev-plus-aosp
Winson Chung [Thu, 6 Jul 2017 03:45:54 +0000 (03:45 +0000)]
Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev
am:
7ee9ec59d8
Change-Id: I3dddc7358cf0147dbd334f9f7e0ec7365048b65b
Android Build Merger (Role) [Thu, 6 Jul 2017 03:45:41 +0000 (03:45 +0000)]
Merge "Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master am:
e62a5fc7d3" into oc-dev-plus-aosp am:
f9d61556b6" into oc-dr1-dev-plus-aosp
Mathieu Chartier [Thu, 6 Jul 2017 03:45:19 +0000 (03:45 +0000)]
Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master am:
e62a5fc7d3" into oc-dev-plus-aosp
am:
f9d61556b6
Change-Id: Ic3cbe67db2d913cc8d75572efbe2ab2e6c0e1faa
Winson Chung [Thu, 6 Jul 2017 03:45:00 +0000 (03:45 +0000)]
Merge "Moving check for empty snapshots earlier." into oc-dr1-dev
am:
161d65640e
Change-Id: If3cf85a88f3d6788042372b4e21ecedc121dfa3a
Android Build Merger (Role) [Thu, 6 Jul 2017 03:44:49 +0000 (03:44 +0000)]
Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446 am:
10f5f8dde5" into oc-dev-plus-aosp am:
b4efa159a1" into oc-dr1-dev-plus-aosp
Mathieu Chartier [Thu, 6 Jul 2017 03:44:29 +0000 (03:44 +0000)]
Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master am:
e62a5fc7d3" into oc-dev-plus-aosp
am:
f9d61556b6
Change-Id: I77a2e1556bae4cc46907e1862ffe5e9585b68394
Android Build Merger (Role) [Thu, 6 Jul 2017 03:44:26 +0000 (03:44 +0000)]
Merge "Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev am:
7ee9ec59d8" into oc-dr1-dev-plus-aosp
OSDN Git Service
