OSDN Git Service

am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165...
authorZach Jang <zachjang@google.com>
Thu, 17 Sep 2015 20:32:53 +0000 (20:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Sep 2015 20:32:53 +0000 (20:32 +0000)
commit7b5bf993e4cc9f333a9adb3a00672c668a0f3fdb
treed516248df4f70b6208cee8ea588df43d2bbbb065
parent1cf21e443aaf207b962f50169be28c0babe71f61
parentfe4cbf2b1b135b327018915a512a8e6293a96017
am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

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