Merge "Add monostate to optional safe unions."
authorSteven Moreland <smoreland@google.com>
Thu, 11 Oct 2018 21:44:26 +0000 (14:44 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 Oct 2018 21:44:26 +0000 (14:44 -0700)
am: 17c437eac1

Change-Id: I28c1b888c3611262dbbbb48f5b3886b7e41ac56d


Trivial merge