tree 568bba2d553a2e0c734ca08ab4e960b64e57841c
parent 982dfc1e43690aaeddbc85c460d4a36038471c43
parent 67a2f02dc39b2700486e0e0eae87ae4b16867180
author Elliott Hughes <enh@google.com> 1531153311 -0700
committer android-build-merger <android-build-merger@google.com> 1531153311 -0700

Merge "C++14 has been the default for a while now." am: d39da4944f
am: 67a2f02dc3

Change-Id: Iaf0b06c21cc0321a98a3a28621e5e61c453c399d