OSDN Git Service

am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221...
authorZach Jang <zachjang@google.com>
Thu, 17 Sep 2015 20:27:20 +0000 (20:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Sep 2015 20:27:20 +0000 (20:27 +0000)
* commit 'e539537d8c7a4288f40afa9226787b9af3d4416b':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3


Trivial merge