tree 2673783470845a2f400564180844970abd49350e
parent 281a868c69e0915efc16eb3c65f669bbf0df69df
parent 937141cb75160a1a51b9568481225aec286c5a86
author Zach Jang <zachjang@google.com> 1442871450 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442871450 +0000

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 '937141cb75160a1a51b9568481225aec286c5a86':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings