tree aecf736316ef2802e46b063eb2b751a31cb3b444
parent 3ec282771faeee8aae116732e0eabba4e5199c38
parent 5d1b9f6ef80ab5c30c12c91a504bd0d27fd274e0
author Mathew Inwood <mathewi@google.com> 1534886747 -0700
committer android-build-merger <android-build-merger@google.com> 1534886747 -0700

[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 6d891937a3 am: 4373a4d763
am: 5d1b9f6ef8  -s ours

Change-Id: I7986a3df145e33fa9167da5212b431c3a560e094