| commit | 81c18489783270c894e10199755d120d8d9e686a | [log] [tgz] |
|---|---|---|
| author | Evan Charlton <evanc@google.com> | Mon Sep 15 23:51:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 15 23:51:00 2014 +0000 |
| tree | 06ebdca95ca03ddabd6888c81e21150eae9cdbfe | |
| parent | 3ef9207d50a384f378d1e5271dfb60bcbd3cba6a [diff] | |
| parent | 1f237771e6aede317a04db219f16c8a81ae6ac14 [diff] |
am 1f237771: am e01a616d: Merge "Show connection managers if any are present" into lmp-dev * commit '1f237771e6aede317a04db219f16c8a81ae6ac14':