tree 5d8cad641af7f99610224cd761db6e9fb09bdb83
parent 43d6dbdc01d75fbe28bbf2f63d50167102c80ddc
parent aa3a71bd85939236b89566e7f9debb22a512557e
author Mathew Inwood <mathewi@google.com> 1534951251 -0700
committer android-build-merger <android-build-merger@google.com> 1534951251 -0700

[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: df82ab2de2 am: b6c87140c7
am: aa3a71bd85  -s ours

Change-Id: Iccef3823952f01df1ccc9b718f60f446aa8eb8e0