Merge "Update security string to 2015-12-01" into mnc-dev
Zach Jang authored
am: 54cb940c

* commit '54cb940c':
  Update security string to 2015-12-01
dfd3524f