commit c64d2a5b7779be797ce4bdaa8ba5eb3e3165fb33
author The Android Automerger <android-build@google.com> Thu May 22 07:21:23 2014 -0700
committer The Android Automerger <android-build@google.com> Thu May 22 07:21:23 2014 -0700
tree 1e633735cdaa84b36e184bd38d38c2d0cded9b73
parent 87b6b24f863e952bec9be7a5cb8415c195744b18
parent 618f9d8beed339b461e236d50d15a0aa35063d1f

merge in master-release history after reset to 87b6b24f863e952bec9be7a5cb8415c195744b18

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 5f48ce4..221a2f3 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,6 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=AAV52
+BUILD_ID := MASTER
+
+DISPLAY_BUILD_NUMBER := true

target/product/core_minimal.mk

diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 0d3fb70..21b3398 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -36,6 +36,7 @@
     com.android.media.remotedisplay \
     com.android.media.remotedisplay.xml \
     drmserver \
+    ethernet-service \
     framework-res \
     idmap \
     installd \
@@ -86,6 +87,7 @@
     android.policy \
     services \
     apache-xml \
+    ethernet-service \
     webviewchromium \
     wifi-service