[automerger skipped] Merge "Stop versioning NDK stubs pre-M."
am: cdf399c40a
-s ours
Change-Id: I466bb6958f19c8d30b8fc0bed0c43c0cbab36b95
This commit is contained in:
commit
1ee2a8b4d8
am: cdf399c40a
-s ours
Change-Id: I466bb6958f19c8d30b8fc0bed0c43c0cbab36b95