tree 02a20dc06040372cd3626c6aa07329947521e581
parent 4188df713d21eae8c034a7f5ed5bc84eed6f3bd9
parent 8afd76dc4bee913834d4d29fabc1a3edb257e20d
author Santos Cordon <santoscordon@google.com> 1418083726 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418083726 +0000

am 8afd76dc: Merge "(Telecom-system part 1) Move global state from TelecomApp to TelecomGlobals." into lmp-mr1-dev

* commit '8afd76dc4bee913834d4d29fabc1a3edb257e20d':
  (Telecom-system part 1) Move global state from TelecomApp to TelecomGlobals.