tree 79db72b35fad356edbc1ae8435d8934b19c2fb61
parent fa0211adc3a8bcc988f5a886e71aab1459f7435e
parent 64397749effa088dcea3799fc8440845c5a1c193
author Christopher Tate <ctate@google.com> 1384483262 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384483262 -0800

am 64397749: am 22010817: Merge "Handle backup transport registration dynamically" into klp-dev

* commit '64397749effa088dcea3799fc8440845c5a1c193':
  Handle backup transport registration dynamically