tree 6da4dce4180375653866fdbd5484569a2f7757a5
parent 10d816c49d85e5a8b75b04d22ba3686c3e83713b
parent a24340805cab8a9fccde5d35c3e54ecd860c8785
author Mathew Inwood <mathewi@google.com> 1534789865 -0700
committer android-build-merger <android-build-merger@google.com> 1534789865 -0700

Merge "Add @UnsupportedAppUsage annotations" am: e84b5dc01f
am: a24340805c

Change-Id: I380f03fe0c949920c14f7c419aa4f596e3d4e232