OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1a6299 0cae838)
am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT...
authorZach Jang <zachjang@google.com>
Mon, 21 Sep 2015 21:30:27 +0000 (21:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Sep 2015 21:30:27 +0000 (21:30 +0000)
* commit '0cae8381666248e44875756e72998e55ed3f9151':
  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