tree e163744cc7dde3c98724cdde3802ee9b01f0ef60
parent 137458b4bf3516941483e59c123c22cbee27ed43
parent 6548a5b20f1e074ce7d18722fac9d9b7f9cdbbed
author Evan Charlton <evanc@google.com> 1410190427 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1410190427 +0000

Merge "Show connection managers if any are present" into lmp-dev