Merge "Fix FrameMetricsObserver crash" into nyc-mr1-dev

am: 0d8f164cde

Change-Id: If87fafcb7cc703fcd92c84fc966535948977083b
This commit is contained in:
John Reck
2016-08-02 18:15:41 +00:00
committed by android-build-merger

Diff Content Not Available