tree 3468f3830e255b3b55316070b4a752aedd4f80d4
parent 2d8c89cd6634863b5edf0fc0bf8c518b650e911a
parent 5a989a504a7c9f2f15bd3195c90c6cd2b213cf69
author Elliott Hughes <enh@google.com> 1475963932 +0000
committer android-build-merger <android-build-merger@google.com> 1475963932 +0000

Merge "Rely on the platform -std default." am: 66f15cc01b
am: 5a989a504a

Change-Id: I1e8593f68eaafb254c92f004c2694ca4145c910a