tree c967256ece86fed4fff71842934de898a04efd20
parent 8d1e06909189371b14aecfbc0d1a1c0d4bb601cd
parent 7a10fd6a473da737c4030d71b033d9559018cdcc
author Mathew Inwood <mathewi@google.com> 1533295300 -0700
committer android-build-merger <android-build-merger@google.com> 1533295300 -0700

Merge "Add @UnsupportedAppUsage annotations" am: f892a8ce9f
am: 7a10fd6a47

Change-Id: I9af4cf36f02d6da12aee1ed8a74b5fe2f2a83a65