tree 4e52e58a4e61b73dcfe4b2b83fd0f67f0fdc61c9
parent 09f5226d3249793795a918f843afa7988ce57552
parent d0f367e71e5ddc030d4125e0770f7270fe98d769
author Mathew Inwood <mathewi@google.com> 1534846134 -0700
committer android-build-merger <android-build-merger@google.com> 1534846134 -0700

[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: a4be791434 am: 2d41b1b460
am: d0f367e71e  -s ours

Change-Id: I91d3eff552dc3772db72c8f0679dac3bd1743212