OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c53f18b fed2854)
am fed28546: am 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf99...
authorZach Jang <zachjang@google.com>
Mon, 21 Sep 2015 21:37:34 +0000 (21:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Sep 2015 21:37:34 +0000 (21:37 +0000)
* commit 'fed2854653d7e9d596cf1d9cb9c41ff05e744e94':
  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