tree 863eab6a124a68fe4b404594f14d295b70c1ec54
parent 38bfdb02db1720da56526944e4ab3a968dc06be1
parent 0ef01bab396b11079dc617873f356f571fc006ed
author Elliott Hughes <enh@google.com> 1476136857 +0000
committer android-build-merger <android-build-merger@google.com> 1476136857 +0000

Merge "Rely on the platform -std default." am: 53b6fc5ddc
am: 0ef01bab39

Change-Id: I11137b0f1327691fa88acee67d9270fe509aa353