OSDN Git Service

am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09...
authorZach Jang <zachjang@google.com>
Mon, 21 Sep 2015 21:07:04 +0000 (21:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Sep 2015 21:07:04 +0000 (21:07 +0000)
commit3e344f3fcb66f3e94a3b5436d5901dec0b94cbb3
tree9c845a9bd72dbf485b22fdeeb91be3b691d5a2da
parent0cae8381666248e44875756e72998e55ed3f9151
parentba80596bc0d51b3ddf14c1612c341992bc3ac5fc
am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

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