tree a3c31e8557842533f0bba9e1341f0e017371efc1
parent f60354183ef8d1f2e5f4325d184a711a67d78ece
parent b7e87b4ad52376981c9d0027e399b0196708009a
author Mathew Inwood <mathewi@google.com> 1534415788 -0700
committer android-build-merger <android-build-merger@google.com> 1534415788 -0700

[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: d08509363c am: 62a722476a
am: b7e87b4ad5  -s ours

Change-Id: I9e06fc4bfabad995970d93b3ed281bd688f795a6