tree 8695bce37f8ac3bc8e5060f417d70eac5cef7610
parent 78108fecb3fd76957a4a8f892b523cf7c4d06cff
parent 4a4717bceeff86b6565129652a770df5de1d528c
author Andrei-Valentin Onea <andreionea@google.com> 1552055590 -0800
committer android-build-merger <android-build-merger@google.com> 1552055590 -0800

[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 10c573ff85 am: f63b6157a1
am: 4a4717bcee -s ours
am skip reason: change_id I570c08292f8a9f512c96f9dce13f5337718f112c with SHA1 da6e570f1e is in history

Change-Id: I6eeb129848fb396edf461c9a70b70974e166afcf