tree 7cb6fdb8eac7a8ef038ab4e5c0f29e0917de3588
parent 64745b114948ea0c774f74af5721b6283087247d
parent 48115bb85ee7c7692b9c70afaa8b0d6a32c24a95
author Ajay Panicker <apanicke@google.com> 1461097994 +0000
committer android-build-merger <android-build-merger@google.com> 1461097994 +0000

"DO NOT MERGE" Add write SMS protection am: fd7a794  -s ours am: daa8d67 am: 5eee2cd
am: 48115bb  -s ours

* commit '48115bb85ee7c7692b9c70afaa8b0d6a32c24a95':
  "DO NOT MERGE" Add write SMS protection

Change-Id: I39546ac3a880b12ddeb33c383184967e90209349