tree 36ce77a5653f505848f6c7c6af8dcfa37a54cddb
parent aa68114d8b0ec92477190ef487c0bb631cf13c3b
parent 44787b6aa7e28fc20708f820c602e3327f17ce6f
author Mathew Inwood <mathewi@google.com> 1535629736 -0700
committer android-build-merger <android-build-merger@google.com> 1535629736 -0700

Merge "Add @UnsupportedAppUsage annotations" am: fa4ccace61
am: 44787b6aa7

Change-Id: Ib8c100ee9d1a968992de1cdebb9519e1f97344dd