resolve merge conflicts of 67daab6 to nyc-mr1-dev-plus-aosp

Change-Id: I35f867b8d6408a7eae9cf5643f0908259de90cb1

diff --cc libs/hwui/Android.mk
Simple merge

diff --cc libs/hwui/FrameInfo.h
Simple merge

diff --cc libs/hwui/JankTracker.h
index a23dd78,126025c..8b482d5
--- 1/libs/hwui/JankTracker.h
--- 2/libs/hwui/JankTracker.h
+++ b/libs/hwui/JankTracker.h
@@@ -56,7 -57,7 +57,7 @@@ struct ProfileData 
  // TODO: Replace DrawProfiler with this
  class JankTracker {
  public:
-     explicit JankTracker(nsecs_t frameIntervalNanos);
 -    JankTracker(const DisplayInfo& displayInfo);
++    explicit JankTracker(const DisplayInfo& displayInfo);
      ~JankTracker();
  
      void addFrame(const FrameInfo& frame);

diff --cc libs/hwui/renderthread/RenderThread.cpp
Simple merge