tree 709089365028ef2f977fa769b0b672a28b3a7006
parent 9314f94b687deb21acd7f05810d3edf1a4e8fcbc
parent 4a9ccd15bd42cfb600d180ae6b7a5ddbebaffc59
author Zach Jang <zachjang@google.com> 1442872369 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442872369 +0000

am 4a9ccd15: am c53f18b7: am 937141cb: am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit '4a9ccd15bd42cfb600d180ae6b7a5ddbebaffc59':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings