Merge change 2790

* changes:
  get rid of utils.h in libutils

simulator/app/LoadableImage.cpp

@@ -17,7 +17,7 @@
 #include "AssetStream.h"
 #include "MyApp.h"
 
-#include <utils.h>
+#include "utils.h"
 
 #include <stdio.h>
 

simulator/app/PhoneCollection.cpp

@@ -18,7 +18,7 @@
 #include "PhoneData.h"
 #include "MyApp.h"
 
-#include <utils.h>
+#include "utils.h"
 
 #include <stdlib.h>
 #include <unistd.h>

simulator/app/PhoneData.cpp

@@ -19,7 +19,7 @@
 #include "PhoneCollection.h"
 #include "MyApp.h"
 
-#include <utils.h>
+#include "utils.h"
 #include <utils/AssetManager.h>
 #include <utils/String8.h>
 

simulator/app/PhoneData.h

@@ -22,7 +22,7 @@
 #include "PhoneButton.h"
 #include "LoadableImage.h"
 #include <ui/PixelFormat.h>
-#include <utils.h>
+#include "utils.h"
 
 
 /*

simulator/app/UserEventMessage.h

@@ -6,7 +6,7 @@
 #ifndef _SIM_USER_EVENT_MESSAGE_H
 #define _SIM_USER_EVENT_MESSAGE_H
 
-#include <utils.h>
+#include "utils.h"
 #include "LogMessage.h"
 
 /*

simulator/app/utils.h

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2005 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//
+// Handy utility functions and portability code.  This file includes all
+// of the generally-useful headers in the "utils" directory.
+//
+#ifndef _SIM_UTILS_H
+#define _SIM_UTILS_H
+
+#include <utils/ported.h>
+#include <utils/Log.h>
+#include <utils/threads.h>
+#include <utils/Timers.h>
+#include <utils/List.h>
+#include <utils/string_array.h>
+#include <utils/misc.h>
+#include <utils/Errors.h>
+
+#endif // _SIM_UTILS_H