tree d749f139a3f5c4d6fd5433380c8410ecb3670ded
parent 39a8dcb58a6a1bf128bbdff7e1f183edb604a881
author Christopher Hocutt <hocutt@google.com> 1443744260 +0000
committer Christopher Hocutt <hocutt@google.com> 1443744297 +0000

Revert "Separating phone and telecom specific protected broadcasts.  Bug: 23192492"

This reverts commit 39a8dcb58a6a1bf128bbdff7e1f183edb604a881.

Change-Id: Ide6f67a802db3d4e1eed24357810e1b38658567f