tree 06cc2d9f3d16aa0c0e589aa93304c00e27e17dc5
parent f9740e3a0258daa399f5d6aae3d16c8f79c38b55
parent 9df26193c8adc43a7ac1ba807e70d0b0772712c0
author Chih-hung Hsieh <chh@google.com> 1538508907 -0700
committer android-build-merger <android-build-merger@google.com> 1538508907 -0700

Merge "Work around bugprone-exception-escape bug."
am: 9df26193c8

Change-Id: I7543b92207d3733b902c371d155c2e245098fc12