OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54801e1 ad8bda2)
am ad8bda21: (-s ours) am 64d1f3ef: DO NOT MERGE - Full (local) restore security...
authorChristopher Tate <ctate@google.com>
Fri, 28 Sep 2012 18:33:54 +0000 (11:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Sep 2012 18:33:54 +0000 (11:33 -0700)
* commit 'ad8bda219e9d9b18144ace7853997c536bb2f1fc':
  DO NOT MERGE - Full (local) restore security changes


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