OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fffb0b3 6c82fe0)
resolved conflicts for merge of 6c82fe07 to master
authorAmith Yamasani <yamasani@google.com>
Fri, 3 Jun 2011 21:34:30 +0000 (14:34 -0700)
committerAmith Yamasani <yamasani@google.com>
Fri, 3 Jun 2011 21:34:30 +0000 (14:34 -0700)
Change-Id: I90943867003999f890c66b3f72ec1ccf19b2d6a6


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