commit fe15b4dad3538fbcbdea3a09243a5f25d3718b3e
author Robert Ly <robertly@google.com> Wed Apr 03 14:06:51 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 03 14:06:51 2013 -0700
tree 5947890652cc0c37c02fdf680ff0ec084d6937d8
parent 24242c60fbec32762608f6eecb91ba5a7d56d86d
parent ca957508015e841d5a6a4e582d73c6d779419561

am ca957508: am f3840a2c: am 99532a5a: am ad027032: am e046ede5: am 3eba74ff: am ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev

* commit 'ca957508015e841d5a6a4e582d73c6d779419561':
  fix android build number in footer of gms and gcm reference

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 61bdc3d..ae2ff93 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -159,7 +159,7 @@
 
     export ANDROID_TOOLCHAIN=$ANDROID_EABI_TOOLCHAIN
     export ANDROID_QTOOLS=$T/development/emulator/qtools
-    export ANDROID_DEV_SCRIPTS=$T/development/scripts
+    export ANDROID_DEV_SCRIPTS=$T/development/scripts:$T/prebuilts/devtools/tools
     export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN$ARM_EABI_TOOLCHAIN_PATH$CODE_REVIEWS:$ANDROID_DEV_SCRIPTS:
     export PATH=$ANDROID_BUILD_PATHS$PATH