OSDN Git Service

am 09611509: am 63712481: am bb97ff59: am a7168e1c: am e539537d: (-s ours) am 7f96f4f...
authorZach Jang <zachjang@google.com>
Mon, 21 Sep 2015 21:06:10 +0000 (21:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Sep 2015 21:06:10 +0000 (21:06 +0000)
* commit '0961150929c775a439f31b8c4fb35ba6a03c6f08':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3


Trivial merge