tree e166cb4756c401e4bf9816e315d60ed0e36ef324
parent f091a339879994b59939cb6613f62f776ad14a42
parent 7d61c7c3547202db0bf8cfe288d266af34c32649
author Abhijith Shastry <ashastry@google.com> 1456519215 +0000
committer android-build-merger <android-build-merger@google.com> 1456519215 +0000

Merge "Add WRITE_BLOCKED_NUMBERS permission to telephony." into nyc-dev
am: 7d61c7c354

* commit '7d61c7c3547202db0bf8cfe288d266af34c32649':
  Add WRITE_BLOCKED_NUMBERS permission to telephony.