| commit | 4e6d3fcff5424a62a6a5e9b87c6d7f4ddf965ebc | [log] [tgz] |
|---|---|---|
| author | David Pursell <dpursell@google.com> | Thu Aug 27 14:35:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:35:58 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 443cd0ae539526569bbd79c7dd3f5da049bf9517 [diff] | |
| parent | ba8dd650cdc93bd20b9cc5494e8b83e5fc7b7af8 [diff] |
am 8056ed53: am f53c7af1: (-s ours) am be1f5732: am f4bda753: Merge "Add feature list to connection banner." * commit '8056ed538f7ef534d9595db0b8f20721a807e963':