commit | ba8dd650cdc93bd20b9cc5494e8b83e5fc7b7af8 | [log] [tgz] |
---|---|---|
author | David Pursell <dpursell@google.com> | Thu Aug 27 11:53:34 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:53:34 2015 +0000 |
tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
parent | 37d97eaffd373adc1e62b2e3a938b2f1fb2b1fb2 [diff] | |
parent | 750b652da84801b6cc970dadcf0c26fe51d4fa07 [diff] |
am f53c7af1: (-s ours) am be1f5732: am f4bda753: Merge "Add feature list to connection banner." * commit 'f53c7af1563dae58d19f1c59fe4a57ab3171e5af':