| commit | b68ad62cf4bdcb3657e03add080ad3b099bdb9b1 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Jan 19 18:28:36 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 19 18:28:36 2016 +0000 |
| tree | ba1901eefeecf6aa66ec25bec86148ceb3afd1e8 | |
| parent | 717f5eeb219700ecd9c1bbc3897db6ec997a0e8b [diff] | |
| parent | f95a3aad974f97330e7284e9d9a613328780fe48 [diff] |
Merge "key_control.cpp: Use linux/keyctl.h" am: a17fc6dab2 am: f95a3aad97 * commit 'f95a3aad974f97330e7284e9d9a613328780fe48': key_control.cpp: Use linux/keyctl.h