tree ae55d1a31fd725951641967a77c879717c7087a6
parent 664e409040e1d3b8c1556a2c1f7967cdf60e07c1
parent de441278e7e5c5b25d2ff1d4a2fd8803b2571cd3
author David Brazdil <dbrazdil@google.com> 1545313800 -0800
committer android-build-merger <android-build-merger@google.com> 1545313800 -0800

Merge "Annotate two non-SDK methods known to be used by apps"
am: de441278e7

Change-Id: I66ec979de4ce5731b144cf5173a0a715d1e8f231