tree e0617f8ac682e05cf917979ce234a8a2058e0c9d
parent 619bafd4c254cf714b07a3208b104c70c37dc74b
parent 06cd1d260b54b963baec45c7f7a756f237c24c14
author Mathew Inwood <mathewi@google.com> 1534960684 -0700
committer android-build-merger <android-build-merger@google.com> 1534960684 -0700

Merge "Add maxTargetSdk to @UnsupportedAppUsage annotation." am: 29f955559a
am: 06cd1d260b

Change-Id: I05d367b1d00961e262e800c552f8ee1f2ef253e9