tree d300ab3da0e3d94d17632cfe498c0889ed3c08a0
parent e5c0b968526379d93e82226710c2c32aa291f09f
parent 25b094b0473bb52238d7d45d4ba69b0d9949121c
author Brandon Maxwell <maxwelb@google.com> 1458579802 +0000
committer android-build-merger <android-build-merger@google.com> 1458579802 +0000

Merge "Only allow primary users to block numbers" into nyc-dev am: c98a563
am: 25b094b

* commit '25b094b0473bb52238d7d45d4ba69b0d9949121c':
  Only allow primary users to block numbers