OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 12a821c 0eb550e)
resolved conflicts for merge of 0eb550ef to master
authorJean-Baptiste Queru <jbq@google.com>
Sun, 10 Oct 2010 15:25:21 +0000 (08:25 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 10 Oct 2010 15:25:21 +0000 (08:25 -0700)
commit902c4a66981ea0a89f924f8318ebc7f8b7d33247
tree4162d45cd5852af914efa32b4b8fb9bcdef51d9ftree | snapshot
parent12a821c7baf4dde36bfba20192bd593800d1c4f5commit | diff
parent0eb550efe2d726d5dcc6f235965f7db259045bddcommit | diff
resolved conflicts for merge of 0eb550ef to master

Change-Id: Id7434c6e95a688bf97786177a8dbecb4c3c5dc95
AndroidManifest.xml diff1 | diff2 | blob | history
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help