Merge branch 'gingerbread' into gingerbread-release
diff --git a/core/build_id.mk b/core/build_id.mk
index 4b7b0e4..d2215e5 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -1,3 +1,4 @@
+
#
# Copyright (C) 2008 The Android Open Source Project
#
@@ -13,20 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-#
-# Defines branch-specific values.
-#
-
# BUILD_ID is usually used to specify the branch name
# (like "MAIN") or a branch name and a release candidate
-# (like "TC1-RC5"). It must be a single word, and is
+# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-#
-BUILD_ID := GINGERBREAD
-# DISPLAY_BUILD_NUMBER should only be set for development branches,
-# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for
-# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY
-# is the same as BUILD_ID
-DISPLAY_BUILD_NUMBER := true
+export BUILD_ID=GRG62
diff --git a/tools/dexpreopt/dexpreopt.py b/tools/dexpreopt/dexpreopt.py
index 376f135..a8f8128 100755
--- a/tools/dexpreopt/dexpreopt.py
+++ b/tools/dexpreopt/dexpreopt.py
@@ -954,7 +954,7 @@
# TODO: unlink the big userdata file now, since the emulator
# has it open.
- if not WaitForEmulator(ep, timeout=20): Fail('Emulator did not respond')
+ if not WaitForEmulator(ep, timeout=120): Fail('Emulator did not respond')
if not ReplaceEmulatorPrompt(ep): Fail('Could not replace prompt')
dest_root = '/data/dexpreopt-root'
