| commit | ffa92b25d18715aebe9cabbc20288d46929a1c87 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Mon May 19 05:49:14 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Mon May 19 05:49:14 2014 -0700 |
| tree | 791ddfdaab1f928d4cf02794a1703e43325eef32 | |
| parent | 6772438d9250c23783a119e405f402e1f2b8d36f [diff] | |
| parent | 35e22f4e45a9b851291067d097deb7202d42e607 [diff] |
merge in master-release history after reset to 6772438d9250c23783a119e405f402e1f2b8d36f
diff --git a/core/build_id.mk b/core/build_id.mk index 1b572cd..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=AAV48 +BUILD_ID := MASTER + +DISPLAY_BUILD_NUMBER := true