tree 4a9e4515a2536f3dad3eb55892f990bd41124478
parent 6d7e85cb6b21e027a677ed2e207c8ff73ed35e24
parent 25889e4d6c7dba08609ba1a35da1fcf5f23ac628
author Glenn Kasten <gkasten@google.com> 1480551456 +0000
committer android-build-merger <android-build-merger@google.com> 1480551456 +0000

Merge "LOCAL_CLANG := true is now the default" am: 1204e3806f
am: 25889e4d6c

Change-Id: I556e40803c942626dceafc7e12278d75ef33337f