tree da3b7f65726357926440d9c7b8d194958e5e8489
parent 27c1d4debb3848f5accd5673fffeeacad3e61648
parent 9dce44ffbb0edcc59b7f72a59099abb313167d0b
author Martijn Coenen <martijn.coenen@nxp.com> 1292544582 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1292544582 -0800

am 9dce44ff: am 4049f9d0: Implement multi-tech connect, enfore tech exclusivity.

* commit '9dce44ffbb0edcc59b7f72a59099abb313167d0b':
  Implement multi-tech connect, enfore tech exclusivity.