Merge "Hide SIP pii data from logs in SipService. am: 226ac3ad92 am: 3081e5a8b6" into nyc-mr1-dev-plus-aosp
am: e6bc23eb27

* commit 'e6bc23eb27e33cc5a544b5e443d71a42ef46ba96':

Change-Id: I627677708c082542112b58e3c2245f8d62257ebe
tree: f3a7b5b001e48298c50058fe2162e56d24557e6e
  1. src/
  2. Android.mk
  3. CleanSpec.mk