tree 7b6e24bc042534946286b1661f347b410ca44b84
parent 49e1c134af19354a0f6d569e8f6ccef811143cc2
parent e84b5dc01f7d6e1b5176d7d3b3168c9943d3174c
author Mathew Inwood <mathewi@google.com> 1534789435 -0700
committer android-build-merger <android-build-merger@google.com> 1534789435 -0700

Merge "Add @UnsupportedAppUsage annotations"
am: e84b5dc01f

Change-Id: I33432f9976ef4e41a35a3f6e78b274dc347d0ecc