tree bf8987bdb255fe86db8afb2d3f5b18b0c85f2cef
parent 52a4039b132c9b1e8062f77390b8337d3775ac39
parent 4a8c67bbe8569bdda41d4aa6143749f650549dc0
author Mathew Inwood <mathewi@google.com> 1533553718 -0700
committer android-build-merger <android-build-merger@google.com> 1533553718 -0700

Merge "Add @UnsupportedAppUsage annotations" am: b40b37910d
am: 4a8c67bbe8

Change-Id: I322cde12d1d6ace5b89eafc9361322eb3ab0821e