OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e54c195 b2b3cec)
am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT...
authorZach Jang <zachjang@google.com>
Mon, 21 Sep 2015 18:58:27 +0000 (18:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Sep 2015 18:58:27 +0000 (18:58 +0000)
* commit 'b2b3cecbd3de80d40f8c207c6aa94532c3426829':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help