OSDN Git Service

am ef024064: (-s ours) am 09611509: am 63712481: am bb97ff59: am a7168e1c: am e539537...
authorZach Jang <zachjang@google.com>
Mon, 21 Sep 2015 23:57:06 +0000 (23:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Sep 2015 23:57:06 +0000 (23:57 +0000)
commit64685ea320f8916087b8fd022ab1ce3028bec62a
tree3110964e1210105dfb31b836787060a9d2843a48
parenta5842d3e17f2d619f5de7bfae85f58ff9642dae4
parentef02406452c41f90955460179c1f1d900bcedba9
am ef024064: (-s ours) am 09611509: am 63712481: am bb97ff59: am a7168e1c: am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

* commit 'ef02406452c41f90955460179c1f1d900bcedba9':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3