tree 97d2746c8b0255f1661a69ef517a23e35f2fbe7d
parent 31e24e118fb861a43121dcb0efd1f88606423206
parent 319fd422c02a8012930019560d1bd913188c86b0
author Dan Willemsen <dwillemsen@google.com> 1471398238 +0000
committer android-build-merger <android-build-merger@google.com> 1471398238 +0000

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

Change-Id: I565f8e3cde5e1810c9d678772564c9e7897e7082