tree 54fc635c82ff6fb2b127c0eb4f672a3e2f99d956
parent 992ade71deb950dc70b197409829c0403562c237
parent 0a41f3c3f1cefcd71cbdd79299fba3482e23a5e2
author Treehugger Robot <treehugger-gerrit@google.com> 1526947144 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1526947144 +0000

Merge changes Ifedddd2b,Iaeeae900,I1f8348fb,Iff042966

* changes:
  Check for WRITE_CALL_LOG permission in CallLogNotificationsQueryHelper.
  Ignore dialer OMTP VVM error if VVM is disabled
  Bump version codes and name to v22
  Adds alternative spam words for non-english speaking countries.