OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49a6bf9 3c7aec3)
Merge commit '3c7aec3'
authorMike Lockwood <lockwood@google.com>
Wed, 21 Mar 2012 23:11:47 +0000 (16:11 -0700)
committerMike Lockwood <lockwood@google.com>
Wed, 21 Mar 2012 23:11:52 +0000 (16:11 -0700)
empty -s ours merge

Change-Id: I5f47de50b940f587b4339c13798ec5797f011d02


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help