tree a359b9870a6fb63ecc4dbf32ab071356d8d0fb83
parent 60f245552c37e8cec68f1a93b2a0a54fe0898aec
parent 4b9c498812c5f3635c941483a6fec19cb432bcb8
author Connor O'Brien <connoro@google.com> 1561508522 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1561508522 +0000

Merge changes I97b697c9,If13df157

* changes:
  libtimeinstate: use std::optional
  libtimeinstate: fix map names