tree 0a54bb798cabc480f2ce4e8a4fcb79bc3cffd9db
parent b2543065fc6335591e0d39ebf2c93cd3b43a4b66
parent 58b0d33e3684ac38dab46c51d4394704e2f21278
author Mathew Inwood <mathewi@google.com> 1534415116 -0700
committer android-build-merger <android-build-merger@google.com> 1534415116 -0700

Merge "Add @UnsupportedAppUsage annotations" am: 348a7e7315
am: 58b0d33e36

Change-Id: I47fd8beb33a06344cbacb1776d5cc3fb03089903