commit 7db43c89a08fe14334ef40a32583c9b20639eac8
author Dehao Chen <dehao@google.com> Thu Aug 21 17:59:11 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 21 17:59:11 2014 +0000
tree 572082e0f7573fe0b6354e010c8462a5b27217ae
parent d43b1cedb0622882de75c395c401fa1b2358b772
parent 19aa0acbf44ea59b8c2a15cf2e7d53eac813a266

am 19aa0acb: am 2d83365c: Merge "Add TARGET_FDO_LDFLAGS to make sure -lgcc is always linked after -lgcov." into lmp-dev

* commit '19aa0acbf44ea59b8c2a15cf2e7d53eac813a266':
  Add TARGET_FDO_LDFLAGS to make sure -lgcc is always linked after -lgcov.

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 \