tree 97d2746c8b0255f1661a69ef517a23e35f2fbe7d
parent 5af810f92a485e63272e4d753cf0a739f9a0dc54
parent efda95c691aca3450a9d3d11675025ab80c5a69d
author Dan Willemsen <dwillemsen@google.com> 1471398624 +0000
committer android-build-merger <android-build-merger@google.com> 1471398624 +0000

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

Change-Id: I5e3553439c67a7bf327c99e85c8abc573a8623c3