tree 329e9ecd3b95ad6ed3b315ff52b0ddfbb6fbf44e
parent 0099def245e260ac853bf1cfac5df49f3d5a4213
parent ee1f25a6dc04ecc82fd868aa64cf305f3dfaa2eb
author Christopher Tate <ctate@google.com> 1410575542 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410575542 +0000

am 82c44d36: am 89b91209: Merge "Track enable/disable of transport components" into lmp-dev

* commit '82c44d3621ecf6c1fa675c6216deb427f7da912a':
  Track enable/disable of transport components