OSDN Git Service

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)
commit0c0d605231e78c3a883b88b4abbc46ee29a7a194
tree580839c1603e5ea4675e148dde980af03b95e167
parent2c705626e5cfa29adddb0f82fca261560d4fd9a8
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.