OSDN Git Service

am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to...
authorElliott Hughes <enh@google.com>
Fri, 7 Sep 2012 20:44:32 +0000 (13:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Sep 2012 20:44:32 +0000 (13:44 -0700)
commit277b3e7edcd5ac48dfbadb246a2bde00edd634a7
tree580839c1603e5ea4675e148dde980af03b95e167
parent91ea2772cc180e83d2abcbdb4fbe72306d14a344
parent105d879ccef2517a07a15f29b956be739504fa73
am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master

* commit '105d879ccef2517a07a15f29b956be739504fa73':
  Stop hard-coding sample 12- and 24-hour times.