OSDN Git Service

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


Trivial merge