tree 07c368c9f71bd65c328b0c9f9bcbce133030a6fb
parent 3152809d46b4237ea52f8a4164304810578375e7
parent e39fa388bfb46822ed59ed7c2c3ac93bd331beb9
author Elliott Hughes <enh@google.com> 1475963888 +0000
committer android-build-merger <android-build-merger@google.com> 1475963888 +0000

Merge "Rely on the platform -std default." am: d2af70179e am: 7493c3bc60
am: e39fa388bf

Change-Id: I730e0a50202cba9077775cb89ff9b9af1c7158fc