resolved conflicts for merge of b184ec2a to mnc-dr-dev-plus-aosp

Change-Id: I90ac0f467ff13a038f27581cb2d07b1c5af5bd92
This commit is contained in:
Dan Willemsen
2015-08-11 18:27:02 -07:00
6 changed files with 10 additions and 38 deletions

View File

@@ -11,8 +11,8 @@ echo "ro.build.version.preview_sdk=$PLATFORM_PREVIEW_SDK_VERSION"
echo "ro.build.version.codename=$PLATFORM_VERSION_CODENAME"
echo "ro.build.version.all_codenames=$PLATFORM_VERSION_ALL_CODENAMES"
echo "ro.build.version.release=$PLATFORM_VERSION"
echo "ro.build.date=`date -d \"$BUILD_DATETIME\"`"
echo "ro.build.date.utc=`date -d \"$BUILD_DATETIME\" +%s`"
echo "ro.build.date=`date`"
echo "ro.build.date.utc=`date +%s`"
echo "ro.build.type=$TARGET_BUILD_TYPE"
echo "ro.build.user=$USER"
echo "ro.build.host=`hostname`"