tree 5bc92de6f453a0652b1965bdc90e8a78a42a1fcc
parent 12eaafd9cf476efc21a73510ce530b5f8a98add6
parent 4535d7cb345d82b627030eb19fc12c3ac6e95676
author Bart Sears <bsears@google.com> 1440651754 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440651754 +0000

am 4535d7cb: (-s ours) am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev

* commit '4535d7cb345d82b627030eb19fc12c3ac6e95676':