tree 2de4202f508dd772a891fc8f94c6563be63ac05d
parent ae8784bbc893541182335c9de7da90c25d505dc7
parent 315621eee0a1199b175ab4d251ea617fdb018fd5
author Dan Willemsen <dwillemsen@google.com> 1464025418 +0000
committer android-build-merger <android-build-merger@google.com> 1464025418 +0000

Merge "Move to a single clang unknown flags list" am: 06935290ac
am: 315621eee0

* commit '315621eee0a1199b175ab4d251ea617fdb018fd5':
  Move to a single clang unknown flags list

Change-Id: I209bf8b868da7b11d55fc6cf701976ff914a2160