tree 0b8141d9768a9ab0455bc8420eadde861c3af1ee
parent b48bc88b75dbba55d77543bf6c87f4909366a61a
parent 35368f24757571b4538f98146f9ed2f1e752c32c
author Elliott Hughes <enh@google.com> 1476233330 +0000
committer android-build-merger <android-build-merger@google.com> 1476233330 +0000

Merge "Rely on the platform -std default." am: 26989871a5
am: 35368f2475

Change-Id: I1dffb52b3f59a8fe42c4c42e10ff7c9287e81e63