* commit '9f1ef6d57bbf1ac524eff849c8976acb012b5687': Tweak for forward-compatibility
This commit is contained in:
committed by
Android Git Automerger
commit
2fdbb37f68