OSDN Git Service

am 22e66b35: am a5842d3e: am f694d378: (-s ours) resolved conflicts for b161297d...
authorZach Jang <zachjang@google.com>
Tue, 22 Sep 2015 00:13:21 +0000 (00:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 22 Sep 2015 00:13:21 +0000 (00:13 +0000)
commit3a5be13442f411153f2c3a2d0f50e1ed7c415f47
tree55c160272a3ac83571c0dc54a5d9f4df1ea92451
parent5790d54ab8d2eb587af7adf39d7abac66b79ad0b
parent22e66b357450bc89d2e9426eddfd7d8ca9c50bc0
am 22e66b35: am a5842d3e: am f694d378: (-s ours) resolved conflicts for b161297d to lmp-mr1-ub-dev

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