tree b40e4a0a74e8d4af639814a13bf4bb307369244f
parent 7bc7929611ebd0f4b8a2240326cf333a165aa030
parent 8f2e5344be2a1869d5e72e97f11fef1b51afb2d4
author Mathew Inwood <mathewi@google.com> 1534470115 -0700
committer android-build-merger <android-build-merger@google.com> 1534470115 -0700

Merge "Add @UnsupportedAppUsage annotations" am: 792fb35cee
am: 8f2e5344be

Change-Id: Ic37a31fc6bd855209003de26489a4c491dc80291