OSDN Git Service

(root) / android-x86 / system-extras.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26ebd81 f9ad69f)
am f9ad69f4: am 803b245e: (-s ours) am 469dbc0a: (-s ours) Reconcile with jb-mr1...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:13:29 +0000 (13:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:13:29 +0000 (13:13 -0700)
* commit 'f9ad69f467c2207e6e8ec995c2b73dde0f6a787f':


Trivial merge
system/extras
About OSDN
Find Software
Develop Software
Help