tree 5f13c945e10f637dcb452c9e52651961d3b870cc
parent 429f4e7ee4557d98888146425d60c35ade5c48f2
parent d487716f875f230fe0d37e5940d8bbf4ab82593a
author Elliott Hughes <enh@google.com> 1475951724 +0000
committer android-build-merger <android-build-merger@google.com> 1475951724 +0000

Merge "Rely on the platform -std default." am: 6bd70bc749
am: d487716f87

Change-Id: I090b6b85c1e2406f16563ad9b16078d655252ad4