OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c70562 105d879)
am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to...
authorElliott Hughes <enh@google.com>
Thu, 6 Sep 2012 23:41:35 +0000 (16:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Sep 2012 23:41:35 +0000 (16:41 -0700)
* commit '105d879ccef2517a07a15f29b956be739504fa73':
  Stop hard-coding sample 12- and 24-hour times.


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