* commit 'ff3ead5072721bfb24202ff9b041cc4291f34e21': Tweaks for forward-compatibility
This commit is contained in:
committed by
Android Git Automerger
commit
49b7338514