tree b46cf78a763d7746ed5f1013e5042e7d25c88919
parent 4a278cde8cb81653f26a52ddbd8c5904c7a5bbcd
parent 2e5fdd0051f4e0136dada304d51a68d7f029ac43
author Mathew Inwood <mathewi@google.com> 1535645427 -0700
committer android-build-merger <android-build-merger@google.com> 1535645427 -0700

Merge "Add @UnsupportedAppUsage annotations" am: 9137ecafbd
am: 2e5fdd0051

Change-Id: I217e9d2fbad18653d33a5a775047a5b0ffaba55d