tree 2c2d1419b5a3429977a2a942676674ab70f542bc
parent 4d2eceffab25f21c311a71d663b7a622b80613b6
parent 8dada718974c425be16dfc4974c7d1f4e310d902
author Nathan Harold <nharold@google.com> 1552074964 -0800
committer android-build-merger <android-build-merger@google.com> 1552074964 -0800

Merge "Add TimeStamp Constructor for HAL 1.4 Support" am: f899e26857
am: 8dada71897

Change-Id: I402d3dfbaba9fabdd65956fd23b3879d0d77df7e