tree daead1bb5d03f7c719ab54e807c5c60298497d4b
parent 3b299d55e75e81453d31a41b69dddf8ff3f06bbb
parent b65e80e534c8e0ca1f2008960ae435594a608e32
author Bertrand Simonnet <bsimonnet@google.com> 1453501681 +0000
committer android-build-merger <android-build-merger@google.com> 1453501681 +0000

Merge "metricsd: Add more assert clause." am: 8f8ce0c300
am: b65e80e534

* commit 'b65e80e534c8e0ca1f2008960ae435594a608e32':
  metricsd: Add more assert clause.