diff options
| author | Siqi Lin <siqilin@google.com> | 2018-10-09 14:24:06 -0700 |
|---|---|---|
| committer | Siqi Lin <siqilin@google.com> | 2018-10-09 14:25:21 -0700 |
| commit | ae2f29938c9e438d1dacd8b4e5e19696a9fc76d0 (patch) | |
| tree | f4acb592cb0895ba70127263fcc3203872e1811f /net/lapb/lapb_timer.c | |
| parent | 2ab2a86ebd7c6876b08854447789bcee56510b72 (diff) | |
| parent | 60e9f50edfe667fa017b2b7fe4f085bbb904eba7 (diff) | |
Merge branch 'android-msm-marlin-3.18-pi-security-next' into android-msm-marlin-3.18-pi
December 2018.1
Bug: 117289242
Change-Id: Iee2ccf94a318fa65aafe94d5c2c7b8a97e753a3a
Signed-off-by: Siqi Lin <siqilin@google.com>
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions