Merge Android Pie into master
Bug: 112104996
Change-Id: I402929a060bee2fb9e8f4a277b5eb6bdb7f5984c
diff --git a/kernel-headers/sound/asound.h b/kernel-headers/sound/asound.h
index a3b58ab..f7ee4d5 100644
--- a/kernel-headers/sound/asound.h
+++ b/kernel-headers/sound/asound.h
@@ -19,6 +19,8 @@
#ifndef _UAPI__SOUND_ASOUND_H
#define _UAPI__SOUND_ASOUND_H
#include <linux/types.h>
+#include <stdlib.h>
+#include <time.h>
#define SNDRV_PROTOCOL_VERSION(major,minor,subminor) (((major) << 16) | ((minor) << 8) | (subminor))
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define SNDRV_PROTOCOL_MAJOR(version) (((version) >> 16) & 0xffff)