Add @TargetApi to version dependent methods.

chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index 7f6684ddcbe0c2a700e46f9fc49deab2bf44a5da..8134f83f4278beabaebe20e1e2134646a4238c07 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -4,6 +4,7 @@
 
 package org.chromium.chrome.browser;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.Context;
@@ -1505,6 +1506,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
      * Merges tabs from a second ChromeTabbedActivity instance if necesssary and calls
      * finishAndRemoveTask() on the other activity.
      */
+    @TargetApi(Build.VERSION_CODES.M)

[Maria, 2016/08/05 23:42:06]

I think this would work with L and above.

[estevenson, 2016/08/08 14:23:49]

It looks like ActivityManager.RecentTaskInfo.baseActivity was added in M if I'm
not mistaken?
https://developer.android.com/reference/android/app/ActivityManager.RecentTas...

     @VisibleForTesting
     public void maybeMergeTabs() {
         if (!FeatureUtilities.isTabModelMergingEnabled()) return;