| commit | f95a3aad974f97330e7284e9d9a613328780fe48 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Jan 19 18:26:48 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 19 18:26:48 2016 +0000 |
| tree | dc653620aaae624ba0c756bedf5791fd20e80ede | |
| parent | 1a7960a6c73dacfece6b9351cf3188d001837607 [diff] | |
| parent | a17fc6dab29c28244d7d5515db67822c18b62b58 [diff] |
Merge "key_control.cpp: Use linux/keyctl.h" am: a17fc6dab2 * commit 'a17fc6dab29c28244d7d5515db67822c18b62b58': key_control.cpp: Use linux/keyctl.h