Merge V8 at r10110: Roll to 3.2.10.40android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4-aah_r1ics-mr1ics-aah-release

Bug: 5654713
Change-Id: I94eb0ed43c585bb042456cb60365e7d9f0f642e6

3 files changed, 8 insertions, 2 deletions

diff --git a/V8_MERGE_REVISION b/V8_MERGE_REVISION
index 1be7896d..a6c144f8 100644
--- a/V8_MERGE_REVISION
+++ b/V8_MERGE_REVISION
@@ -2,4 +2,4 @@ We are tracking the V8 3.2 release branch as used by the Chrome 12 release branc
 
 We have synced V8 past the last revision used in Chrome 12, as we continue to take 3.2 updates.
 
-http://v8.googlecode.com/svn/branches/3.2@9719
+http://v8.googlecode.com/svn/branches/3.2@10110
diff --git a/src/log.h b/src/log.h
index 4fb0e230..1fa86d24 100644
--- a/src/log.h
+++ b/src/log.h
@@ -294,7 +294,13 @@ class Logger {
   INLINE(static LogEventsAndTags ToNativeByScript(LogEventsAndTags, Script*));
 
   // Profiler's sampling interval (in milliseconds).
+#if defined(ANDROID)
+  // Phones and tablets have processors that are much slower than desktop
+  // and laptop computers for which current heuristics are tuned.
+  static const int kSamplingIntervalMs = 5;
+#else
   static const int kSamplingIntervalMs = 1;
+#endif
 
   // Callback from Log, stops profiling in case of insufficient resources.
   void LogFailure();
diff --git a/src/version.cc b/src/version.cc
index 1d59be3c..47e7fe25 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     2
 #define BUILD_NUMBER      10
-#define PATCH_LEVEL       39
+#define PATCH_LEVEL       40
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0