commit d43b1cedb0622882de75c395c401fa1b2358b772
author Baligh Uddin <baligh@google.com> Thu Aug 21 16:54:06 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 21 16:54:06 2014 +0000
tree 6049d7350a7970d939c6178ce3303d9d9c5b8c62
parent 331edb0187023931f208ef909a874336e5db6a9f
parent 8883508aa905ce3d9d5eda5a0bfa7c8f12c0b90e

am 8883508a: am cc4c481b: Add en_AU as a supported locale

* commit '8883508aa905ce3d9d5eda5a0bfa7c8f12c0b90e':
  Add en_AU as a supported locale

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 \