tree d03b2c72fad9a848095ec1734803e22880c6f95e
parent ea160e2e402e708cfedc6fc4601e77d6041938a8
parent bce19ce7dff918c12604614a5e27d02b78e877a4
author Calin Juravle <calin@google.com> 1458235813 +0000
committer android-build-merger <android-build-merger@google.com> 1458235813 +0000

Merge "resolve merge conflicts of c19c1c2 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
am: bce19ce

* commit 'bce19ce7dff918c12604614a5e27d02b78e877a4':
  Add ProfileSaver stats and dump them during SigQuit