From e612775922ec9f8cc4e5cb976bc62b3312a3de0e Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 21 Jul 2015 17:01:26 -0700
Subject: resolved conflicts for merge of 13ef17a3 to mnc-dr-dev b/22609402
 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b

---
 src/com/android/launcher3/MemoryTracker.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/com/android/launcher3/MemoryTracker.java')

diff --git a/src/com/android/launcher3/MemoryTracker.java b/src/com/android/launcher3/MemoryTracker.java
index 2d37c809e..067a50f97 100644
--- a/src/com/android/launcher3/MemoryTracker.java
+++ b/src/com/android/launcher3/MemoryTracker.java
@@ -101,7 +101,7 @@ public class MemoryTracker extends Service {
 
     public void startTrackingProcess(int pid, String name, long start) {
         synchronized (mLock) {
-            final Long lpid = new Long(pid);
+            final Long lpid = Long.valueOf(pid);
 
             if (mPids.contains(lpid)) return;
 
-- 
cgit v1.2.3