tree a25db2008dd66882aeeea336a074200906871eb5
parent 3d5575ef3d55bf2f9f840bd40ea1a72cb88f479c
parent 665526816212546ee51b76ae7b878bebfca38177
author Elliott Hughes <enh@google.com> 1475972114 +0000
committer android-build-merger <android-build-merger@google.com> 1475972114 +0000

Merge "Rely on the platform -std default." am: 329e73bda6 am: 6b24b5786d
am: 6655268162

Change-Id: I706151b0a0d0fede0ec6b681c9a15f6ffe60a5c8