OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa64b11 7e8c613)
am 7e8c613f: (-s ours) Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 28 Sep 2012 19:58:34 +0000 (12:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Sep 2012 19:58:34 +0000 (12:58 -0700)
* commit '7e8c613f823b382ecc7cab843e2920aa5dd05447':
  DO NOT MERGE - Full (local) restore security changes


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