tree dca333be8d056665e62d8df3922c0dd9de60e485
parent 9cff3fe4adc2ac3ff782453bf4c567f750a4c209
parent 1b81880fe5d0e6f96fe69c708e211e3a0ae303c2
author Colin Cross <ccross@android.com> 1525990273 -0700
committer android-build-merger <android-build-merger@google.com> 1525990273 -0700

Merge "Remove -Wno-error from system/extras" am: 8ac93f3822
am: 1b81880fe5

Change-Id: I2fb7807f48d6ca1f28371c80f8c111268ca08e21