[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: cdf8d71a9f am: 6a9a136f6a
am:93ecd3ea25-s ours am skip reason: change_id I7489aad1dceeb18ed7ca48a1ed8829a668b3fa04 with SHA10fbf072ca6is in history Change-Id: Ic26a760f7e86a4f8e2911bc4d57509bfb574f447
This commit is contained in: