am 09a7d324: am 388dbd28: Merge "Include <time.h> for clock_nanosleep."

* commit '09a7d324ef15dab7f7bea72aa16b1585285cadf1':
  Include <time.h> for clock_nanosleep.
This commit is contained in:
Elliott Hughes
2014-10-21 17:59:04 +00:00
committed by Android Git Automerger

View File

@@ -23,6 +23,7 @@
#include <fcntl.h>
#include <utils/misc.h>
#include <signal.h>
#include <time.h>
#include <cutils/properties.h>
@@ -57,10 +58,6 @@
#define SYSTEM_ENCRYPTED_BOOTANIMATION_FILE "/system/media/bootanimation-encrypted.zip"
#define EXIT_PROP_NAME "service.bootanim.exit"
extern "C" int clock_nanosleep(clockid_t clock_id, int flags,
const struct timespec *request,
struct timespec *remain);
namespace android {
static const int ANIM_ENTRY_NAME_MAX = 256;