tree 1bacd0b4c60b17803fbc276fd7cc797c87b84df7
parent 5f1fccf87a9fabf4a7bf0ca130aba0c4227b5c68
parent f9699e710cd903a783ffb18147785983ed2b7336
author Bertrand Simonnet <bsimonnet@google.com> 1448931734 +0000
committer android-build-merger <android-build-merger@google.com> 1448931734 +0000

Merge "metricsd: Specify directory for persistent integers." am: 8a2a635d3c am: 20bb55e6ea
am: f9699e710c

* commit 'f9699e710cd903a783ffb18147785983ed2b7336':
  metricsd: Specify directory for persistent integers.