commit 331edb0187023931f208ef909a874336e5db6a9f
author Elliott Hughes <enh@google.com> Thu Aug 21 05:30:39 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 21 05:30:39 2014 +0000
tree 0157d30307ebb7e95ec844b555cf4470231c30a6
parent 4ba9bb0f98c1c10a4300cedceea605e622933e2d
parent 5ba5283aee3ff87a3481ec604c3fbe314d1129b7

am 5ba5283a: am 9f6ae4ba: am d61f0ffd: Merge "HAVE_FUTEX is unused."

* commit '5ba5283aee3ff87a3481ec604c3fbe314d1129b7':
  HAVE_FUTEX is unused.

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 00a691f..0e8e2cf 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=LMP
+export BUILD_ID=MASTER

core/pathmap.mk

diff --git a/core/pathmap.mk b/core/pathmap.mk
index fbc24b0..0e10ac1 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -107,6 +107,7 @@
 #
 FRAMEWORKS_SUPPORT_SUBDIRS := \
         annotations \
+        media/protocols \
         v4 \
         v7/gridlayout \
         v7/appcompat \

target/product/base.mk

diff --git a/target/product/base.mk b/target/product/base.mk
index 6c495e3..3609d03 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -35,6 +35,7 @@
     fsck_msdos \
     ime \
     input \
+    inputflinger \
     javax.obex \
     libandroid \
     libandroid_runtime \