commit fd07d61614e4b358349d1d46a32f9477784404c4
author Elliott Hughes <enh@google.com> Wed Sep 12 08:55:32 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 12 08:55:32 2012 -0700
tree 8bdd168c74fc2034c7b7ef96e44b3c7c35c4ab16
parent ed757e9729b325f00e70f506ad6e217910563d0a
parent fbe1cc92d9e8930700c15f68717dd66fc1523177

am fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."

* commit 'fbe1cc92d9e8930700c15f68717dd66fc1523177':
  Don't include <linux/socket.h> directly.

media/common_time/ICommonClock.cpp

diff --git a/media/common_time/ICommonClock.cpp b/media/common_time/ICommonClock.cpp
index 28b43ac..25ae69e 100644
--- a/media/common_time/ICommonClock.cpp
+++ b/media/common_time/ICommonClock.cpp
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <linux/socket.h>
+
+#include <sys/socket.h>
 
 #include <common_time/ICommonClock.h>
 #include <binder/Parcel.h>

media/common_time/ICommonTimeConfig.cpp

diff --git a/media/common_time/ICommonTimeConfig.cpp b/media/common_time/ICommonTimeConfig.cpp
index 8eb37cb..67167b0 100644
--- a/media/common_time/ICommonTimeConfig.cpp
+++ b/media/common_time/ICommonTimeConfig.cpp
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <linux/socket.h>
+
+#include <sys/socket.h>
 
 #include <common_time/ICommonTimeConfig.h>
 #include <binder/Parcel.h>