"DO NOT MERGE" Add write SMS protection am: ecd1de0  -s ours am: b44ea3f am: ca4af74 am: 3cde5e3  -s ours am: a9eb991 am: 71aa114 am: a7d8743
am: 777f22e  -s ours

* commit '777f22e29c7dcd9b50ddace8aaeba06c8ded68c7':
  "DO NOT MERGE" Add write SMS protection

Change-Id: Ida61f3ba3d91a67185cb06411251dea62d8eedc4
tree: 03b673538fb3aca529a5662051581b90697c90bb
  1. android/