tree 11ea1c1a925a597eb9d12be27dbb37b9c5388816
parent f82c47fc72ace2f75b2c6685fb3e35e88754eaba
parent af43472016ad9efca5e1cfbe5b954eafaa88c094
author Mathew Inwood <mathewi@google.com> 1533915524 -0700
committer android-build-merger <android-build-merger@google.com> 1533915524 -0700

Merge "Add @UnsupportedAppUsage annotations" am: eabac25941
am: af43472016

Change-Id: Icea7bcde6cb67ce96236a9f703d1e3093728faaf