am 788aa67d: Merge change 21305 into donut

Merge commit '788aa67d1a3a94565b6209a07a023dca182b9b99' into eclair

* commit '788aa67d1a3a94565b6209a07a023dca182b9b99':
  Bump release version to android-1.6_r1
This commit is contained in:
David 'Digit' Turner
2009-08-18 10:39:17 -07:00
committed by Android Git Automerger
2 changed files with 2 additions and 2 deletions

View File

@@ -23,7 +23,7 @@ NDK_ROOT_DIR=`dirname $0`/../..
NDK_ROOT_DIR=`cd $NDK_ROOT_DIR && pwd` NDK_ROOT_DIR=`cd $NDK_ROOT_DIR && pwd`
# the release name # the release name
RELEASE=1.5_r2 RELEASE=1.6_r1
# the package prefix # the package prefix
PREFIX=android-ndk PREFIX=android-ndk

View File

@@ -1,7 +1,7 @@
Android NDK ChangeLog: Android NDK ChangeLog:
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
current version android-ndk-1.6_r1
IMPORTANT BUG FIXES: IMPORTANT BUG FIXES: