tree 7f667083ebe8c481c6b6394751bcc9f5b16bf7e5
parent 6e30f4c7898b662804ada64bf66cb696ead3735c
parent 0d8f164cdea03c8b114d6627c821fbcbae0ec298
author John Reck <jreck@google.com> 1470161741 +0000
committer android-build-merger <android-build-merger@google.com> 1470161741 +0000

Merge "Fix FrameMetricsObserver crash" into nyc-mr1-dev
am: 0d8f164cde

Change-Id: If87fafcb7cc703fcd92c84fc966535948977083b