diff options
| author | Todd Kjos <tkjos@google.com> | 2017-03-20 08:55:18 -0700 |
|---|---|---|
| committer | Todd Kjos <tkjos@google.com> | 2017-03-20 08:57:38 -0700 |
| commit | 77e4e5b8af91b28c8ae69b78422e835c9c1a17fe (patch) | |
| tree | 070155798e1bb0bdc31c510c5e483283d62f1e09 /include/linux | |
| parent | 83193f99f1be71d6a6095ef56437d0711031854b (diff) | |
| parent | 28ec98bc2e4a175b60f45d505e715a33b93dd077 (diff) | |
resolve merge conflicts of 1c5265be54d3 to android-4.4
Change-Id: Idd5f2956c09b193b2a6ba02410e90b52aa2284d7
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions