tree 0e1ab2044b141848cc42c740b6f6d910385a67b9
parent 07e2c195367119faa4645d3f9f0dcb1c6aba7396
parent 54cb940c4a07701212e96f77ee4a89493b0f251b
author Zach Jang <zachjang@google.com> 1445906696 +0000
committer android-build-merger <android-build-merger@google.com> 1445906696 +0000

Merge "Update security string to 2015-12-01" into mnc-dev
am: 54cb940c4a

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