am f53c7af1: (-s ours) am be1f5732: am f4bda753: Merge "Add feature list to connection banner."

* commit 'f53c7af1563dae58d19f1c59fe4a57ab3171e5af':
This commit is contained in:
David Pursell 2015-08-27 11:53:34 +00:00 committed by Android Git Automerger
commit 8056ed538f

Diff content is not available