tree fe50dc8b98c37f7687e17323b9280732632cf023
parent e9a54af0fcd381f5f120937208a4c05c40bb4d9b
parent a872cb1fcc26d6003d99ea5853ea972f9864ff8c
author David Brazdil <dbrazdil@google.com> 1535711888 -0700
committer android-build-merger <android-build-merger@google.com> 1535711888 -0700

Merge "Add android:usesNonSdkApi manifest attribute" am: 9446fbbeb8
am: a872cb1fcc

Change-Id: I489673fe1b36c146b9b64f3da434b853e002a472