tree c2aa2a6e45e7d3ed2a586317ad5fb5f9e5b4b97a
parent 65c26fc43606f57521579dfa1b431a265e159b60
parent e6970c06d720a7cb7d174341dcbd32180887b9b2
author Paul Duffin <paulduffin@google.com> 1559836258 -0700
committer android-build-merger <android-build-merger@google.com> 1559836258 -0700

Merge "Allow the unsupportedappusage-annotation to be used for device variants" am: a1df2cb009
am: e6970c06d7

Change-Id: Ibf6f3c3895602d332b2a021bccbdab1846ec73b4