tree 4052228d44eda3be138c1f55511e2df5a16d815c
parent 5ebfa32c5334c06769a14a72d166d4bd96dd58c2
parent 138c7baabea9c6369a3dacd560f2009b0201619e
author Dmitry Shmidt <dimitrysh@google.com> 1501778377 +0000
committer android-build-merger <android-build-merger@google.com> 1501778377 +0000

Merge "clang: Allow LOCAL_CLANG exception for device/google/contexthub project"
am: 138c7baabe

Change-Id: I5f821a275c744796f654242c05caeea44691f0e3