OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5790d54 22e66b3)
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)
* commit '22e66b357450bc89d2e9426eddfd7d8ca9c50bc0':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3


Trivial merge
build
About OSDN
Find Software
Develop Software
Help