tree d701e578d888daf9a79eef03b8c4705c2bc96c16
parent 2888eec0bdf3186dce7d26a2c5d141d6fae4c6a5
parent 300b1a6b47bde407b5117cab55fa9d777825d97d
author Bertrand Simonnet <bsimonnet@google.com> 1440102449 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440102449 +0000

am 300b1a6b: Merge "metricsd: Don\'t crash when some metadata is missing."

* commit '300b1a6b47bde407b5117cab55fa9d777825d97d':
  metricsd: Don't crash when some metadata is missing.