OSDN Git Service

am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT...
authorZach Jang <zachjang@google.com>
Mon, 21 Sep 2015 21:30:06 +0000 (21:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Sep 2015 21:30:06 +0000 (21:30 +0000)
commit2ead093496c3b5b266c21a483c4f0c37869d57de
tree7501da73d6c325513cf56566749cb0dda39437da
parent1538dde4fbb00617bfd1d51f958f32ba4d68ff12
parent386c7763eb8cd3e856a26fe3cbd39cc573978c29
am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit '386c7763eb8cd3e856a26fe3cbd39cc573978c29':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3