tree 97d2746c8b0255f1661a69ef517a23e35f2fbe7d
parent 31e24e118fb861a43121dcb0efd1f88606423206
parent 24905f154e8ed939fe2e276052681aee1004d405
author Dan Willemsen <dwillemsen@google.com> 1471398144 +0000
committer android-build-merger <android-build-merger@google.com> 1471398144 +0000

Merge "Mark default.supp as ETC instead of SHARED_LIBRARY"
am: 24905f154e

Change-Id: I6e980ad5cb4c77bcfdd9fff774d63838c9d86c50