tree 24cbf83e806c791f5df4a2d7b0f83427c2115cd9
parent b7e87b4ad52376981c9d0027e399b0196708009a
parent 1b7a5028a09143de65841dc4cdbf9f381001f361
author Mathew Inwood <mathewi@google.com> 1534414534 -0700
committer android-build-merger <android-build-merger@google.com> 1534414534 -0700

Merge "Add @UnsupportedAppUsage annotations" am: b558baa4cc
am: 1b7a5028a0

Change-Id: I45db75d8ca19decae25cd99ddf842322c28d5b10