summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-02-17 01:34:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-17 01:34:35 +0000
commitb1ea8a5316f9e439fd7608e1152c45aaf8f098ff (patch)
treeac536ca51d1d563082a710c49c90ac5f9cc4905e
parentc8036cdc602a35a415fd66370c7621bb957f657e (diff)
parent2aa2672dd8168ac2bbd9d01c31ff14fea226b089 (diff)
downloadframeworks_base-b1ea8a5316f9e439fd7608e1152c45aaf8f098ff.zip
frameworks_base-b1ea8a5316f9e439fd7608e1152c45aaf8f098ff.tar.gz
frameworks_base-b1ea8a5316f9e439fd7608e1152c45aaf8f098ff.tar.bz2
am 2aa2672d: am 627396ac: Merge "Add missing <sys/file.h> include for flock."
* commit '2aa2672dd8168ac2bbd9d01c31ff14fea226b089': Add missing <sys/file.h> include for flock.
-rw-r--r--cmds/idmap/create.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmds/idmap/create.cpp b/cmds/idmap/create.cpp
index 7a501a4..16532b8 100644
--- a/cmds/idmap/create.cpp
+++ b/cmds/idmap/create.cpp
@@ -7,6 +7,7 @@
#include <utils/String8.h>
#include <fcntl.h>
+#include <sys/file.h>
#include <sys/stat.h>
using namespace android;